summaryrefslogtreecommitdiffstats
path: root/src/gallium/winsys
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2012-02-07 11:16:35 +0000
committerJosé Fonseca <[email protected]>2012-02-07 11:40:58 +0000
commitf763ad51302a8b3517e85ae7f2ee94d40b1e0326 (patch)
treed7ba0322a1c743989681f90bc478612b77e3448f /src/gallium/winsys
parentaed51e3e6a90dd667bd9915817d16ba14a79720c (diff)
scons: r300/r600 now depends on libdrm.
As they now indirectly include on libdrm/radeon_surface.h.
Diffstat (limited to 'src/gallium/winsys')
-rw-r--r--src/gallium/winsys/SConscript35
-rw-r--r--src/gallium/winsys/radeon/drm/SConscript2
2 files changed, 1 insertions, 36 deletions
diff --git a/src/gallium/winsys/SConscript b/src/gallium/winsys/SConscript
deleted file mode 100644
index f3a2453e834..00000000000
--- a/src/gallium/winsys/SConscript
+++ /dev/null
@@ -1,35 +0,0 @@
-Import('*')
-
-
-SConscript([
- 'sw/wrapper/SConscript',
-])
-
-SConscript([
- 'sw/xlib/SConscript',
-])
-
-SConscript([
- 'sw/gdi/SConscript',
-])
-
-SConscript([
- 'i915/sw/SConscript',
-])
-
-if env['dri']:
- SConscript([
- 'sw/dri/SConscript',
- ])
-
- SConscript([
- 'svga/drm/SConscript',
- ])
-
- SConscript([
- 'i915/drm/SConscript',
- ])
-
- SConscript([
- 'radeon/drm/SConscript',
- ])
diff --git a/src/gallium/winsys/radeon/drm/SConscript b/src/gallium/winsys/radeon/drm/SConscript
index e5048d6255d..8edd97b24fb 100644
--- a/src/gallium/winsys/radeon/drm/SConscript
+++ b/src/gallium/winsys/radeon/drm/SConscript
@@ -4,7 +4,7 @@ env = env.Clone()
radeon_sources = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
-env.PkgUseModules('DRM')
+env.PkgUseModules('DRM_RADEON')
radeonwinsys = env.ConvenienceLibrary(
target ='radeonwinsys',