summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/gbm
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2011-09-27 16:42:01 +0200
committerMarek Olšák <maraeo@gmail.com>2011-09-30 23:19:52 +0200
commitbf0baa771709e1076613cf9f9bed6ac004dd0439 (patch)
tree02a54fd5ee82e00c00de2d224cb37db862759c40 /src/gallium/targets/gbm
parent363ff844753c46ac9c13866627e096b091ea81f8 (diff)
downloadexternal_mesa3d-bf0baa771709e1076613cf9f9bed6ac004dd0439.zip
external_mesa3d-bf0baa771709e1076613cf9f9bed6ac004dd0439.tar.gz
external_mesa3d-bf0baa771709e1076613cf9f9bed6ac004dd0439.tar.bz2
r600g: move all files from winsys/r600 into drivers/r600
Be sure to reconfigure after this commit. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'src/gallium/targets/gbm')
-rw-r--r--src/gallium/targets/gbm/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/targets/gbm/Makefile b/src/gallium/targets/gbm/Makefile
index c516588..3f52aae 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