summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/dri-r600
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/dri-r600
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/dri-r600')
-rw-r--r--src/gallium/targets/dri-r600/Makefile1
-rw-r--r--src/gallium/targets/dri-r600/SConscript1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/gallium/targets/dri-r600/Makefile b/src/gallium/targets/dri-r600/Makefile
index 2d74630..2995b58 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 c10d65b..73238f3 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,