diff options
Diffstat (limited to 'src/gallium/targets')
| -rw-r--r-- | src/gallium/targets/dri-r600/Makefile | 1 | ||||
| -rw-r--r-- | src/gallium/targets/dri-r600/SConscript | 1 | ||||
| -rw-r--r-- | src/gallium/targets/egl-static/Makefile | 5 | ||||
| -rw-r--r-- | src/gallium/targets/egl-static/SConscript | 1 | ||||
| -rw-r--r-- | src/gallium/targets/gbm/Makefile | 5 | ||||
| -rw-r--r-- | src/gallium/targets/va-r600/Makefile | 1 | ||||
| -rw-r--r-- | src/gallium/targets/vdpau-r600/Makefile | 1 | ||||
| -rw-r--r-- | src/gallium/targets/xorg-r600/Makefile | 1 | ||||
| -rw-r--r-- | src/gallium/targets/xvmc-r600/Makefile | 1 |
9 files changed, 6 insertions, 11 deletions
diff --git a/src/gallium/targets/dri-r600/Makefile b/src/gallium/targets/dri-r600/Makefile index 2d7463008fe..2995b58876b 100644 --- a/src/gallium/targets/dri-r600/Makefile +++ b/src/gallium/targets/dri-r600/Makefile @@ -6,7 +6,6 @@ LIBNAME = r600_dri.so PIPE_DRIVERS = \ $(TOP)/src/gallium/drivers/r600/libr600.a \ $(TOP)/src/gallium/state_trackers/dri/drm/libdridrm.a \ - $(TOP)/src/gallium/winsys/r600/drm/libr600winsys.a \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/trace/libtrace.a \ $(TOP)/src/gallium/drivers/rbug/librbug.a \ diff --git a/src/gallium/targets/dri-r600/SConscript b/src/gallium/targets/dri-r600/SConscript index c10d65b595a..73238f336ff 100644 --- a/src/gallium/targets/dri-r600/SConscript +++ b/src/gallium/targets/dri-r600/SConscript @@ -7,7 +7,6 @@ env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE']) env.Prepend(LIBS = [ st_dri, radeonwinsys, - r600winsys, r600, trace, rbug, diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile index 2c07455ee4a..17a578d43af 100644 --- a/src/gallium/targets/egl-static/Makefile +++ b/src/gallium/targets/egl-static/Makefile @@ -129,13 +129,14 @@ endif endif # r600 -ifneq ($(findstring r600/drm,$(GALLIUM_WINSYS_DIRS)),) +ifneq ($(findstring radeon/drm,$(GALLIUM_WINSYS_DIRS)),) +ifneq ($(findstring r600,$(GALLIUM_DRIVERS_DIRS)),) egl_CPPFLAGS += -D_EGL_PIPE_R600=1 egl_LIBS += \ - $(TOP)/src/gallium/winsys/r600/drm/libr600winsys.a \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/r600/libr600.a endif +endif # vmwgfx ifneq ($(findstring svga/drm,$(GALLIUM_WINSYS_DIRS)),) diff --git a/src/gallium/targets/egl-static/SConscript b/src/gallium/targets/egl-static/SConscript index dfd05437231..a929d600349 100644 --- a/src/gallium/targets/egl-static/SConscript +++ b/src/gallium/targets/egl-static/SConscript @@ -104,7 +104,6 @@ if env['HAVE_DRM']: env.Prepend(LIBS = [ radeonwinsys, r300, - r600winsys, r600, ]) diff --git a/src/gallium/targets/gbm/Makefile b/src/gallium/targets/gbm/Makefile index c516588f95f..3f52aae6f33 100644 --- a/src/gallium/targets/gbm/Makefile +++ b/src/gallium/targets/gbm/Makefile @@ -82,7 +82,6 @@ r300_LIBS = \ # r600 pipe driver r600_LIBS = \ - $(TOP)/src/gallium/winsys/r600/drm/libr600winsys.a \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/r600/libr600.a @@ -130,10 +129,12 @@ pipe_SOURCES += pipe_r300.c endif endif -ifneq ($(findstring r600/drm,$(GALLIUM_WINSYS_DIRS)),) +ifneq ($(findstring radeon/drm,$(GALLIUM_WINSYS_DIRS)),) +ifneq ($(findstring r600,$(GALLIUM_DRIVERS_DIRS)),) pipe_TARGETS += $(PIPE_PREFIX)r600.so pipe_SOURCES += pipe_r600.c endif +endif ifneq ($(findstring svga/drm,$(GALLIUM_WINSYS_DIRS)),) pipe_TARGETS += $(PIPE_PREFIX)vmwgfx.so diff --git a/src/gallium/targets/va-r600/Makefile b/src/gallium/targets/va-r600/Makefile index d09a3aa8ad2..3aee430000d 100644 --- a/src/gallium/targets/va-r600/Makefile +++ b/src/gallium/targets/va-r600/Makefile @@ -9,7 +9,6 @@ DRIVER_INCLUDES = PIPE_DRIVERS = \ $(TOP)/src/gallium/drivers/r600/libr600.a \ $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \ - $(TOP)/src/gallium/winsys/r600/drm/libr600winsys.a \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \ $(TOP)/src/gallium/drivers/trace/libtrace.a \ diff --git a/src/gallium/targets/vdpau-r600/Makefile b/src/gallium/targets/vdpau-r600/Makefile index c2d95af295a..17805e326c3 100644 --- a/src/gallium/targets/vdpau-r600/Makefile +++ b/src/gallium/targets/vdpau-r600/Makefile @@ -6,7 +6,6 @@ LIBBASENAME = vdpau_r600 PIPE_DRIVERS = \ $(TOP)/src/gallium/drivers/r600/libr600.a \ $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \ - $(TOP)/src/gallium/winsys/r600/drm/libr600winsys.a \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/trace/libtrace.a \ $(TOP)/src/gallium/auxiliary/libgallium.a diff --git a/src/gallium/targets/xorg-r600/Makefile b/src/gallium/targets/xorg-r600/Makefile index 4577ba605a5..08d5635e633 100644 --- a/src/gallium/targets/xorg-r600/Makefile +++ b/src/gallium/targets/xorg-r600/Makefile @@ -13,7 +13,6 @@ DRIVER_DEFINES = \ DRIVER_PIPES = \ $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \ $(TOP)/src/gallium/drivers/r600/libr600.a \ - $(TOP)/src/gallium/winsys/r600/drm/libr600winsys.a \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/galahad/libgalahad.a \ $(TOP)/src/gallium/drivers/trace/libtrace.a \ diff --git a/src/gallium/targets/xvmc-r600/Makefile b/src/gallium/targets/xvmc-r600/Makefile index a10a42d18ed..7be866510d6 100644 --- a/src/gallium/targets/xvmc-r600/Makefile +++ b/src/gallium/targets/xvmc-r600/Makefile @@ -6,7 +6,6 @@ LIBBASENAME = XvMCr600 PIPE_DRIVERS = \ $(TOP)/src/gallium/drivers/r600/libr600.a \ $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \ - $(TOP)/src/gallium/winsys/r600/drm/libr600winsys.a \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/trace/libtrace.a \ $(TOP)/src/gallium/auxiliary/libgallium.a |