summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJosé Fonseca <jrfonseca@tungstengraphics.com>2008-02-23 19:49:08 +0900
committerJosé Fonseca <jrfonseca@tungstengraphics.com>2008-02-23 19:49:08 +0900
commit58a3d7dfd94453c25607106835fbbb3a54d42306 (patch)
tree528bfff532b8de724d5f9a232d0ef9a7cd8ebb4c /src
parente8de5c70e3370e9112a5facc870075eea60c4c46 (diff)
Revamp scons usage.
Diffstat (limited to 'src')
-rw-r--r--src/gallium/SConscript16
-rw-r--r--src/gallium/winsys/SConscript2
2 files changed, 5 insertions, 13 deletions
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 210fd7d309..fa4833cbcf 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -1,3 +1,5 @@
+import os
+
Import('*')
env = env.Clone()
@@ -20,15 +22,5 @@ SConscript([
if llvm:
SConscript(['auxiliary/gallivm/SConscript'])
-SConscript([
- 'drivers/softpipe/SConscript',
- 'drivers/i915simple/SConscript',
- 'drivers/failover/SConscript',
-])
-
-if not msvc:
- SConscript(['drivers/i965simple/SConscript'])
-
-#if cell:
-# SConscript(['drivers/cell/SConscript'])
- \ No newline at end of file
+for driver in env['drivers']:
+ SConscript(os.path.join('drivers', driver, 'SConscript'))
diff --git a/src/gallium/winsys/SConscript b/src/gallium/winsys/SConscript
index 3f0596e19c..635a68eea2 100644
--- a/src/gallium/winsys/SConscript
+++ b/src/gallium/winsys/SConscript
@@ -5,7 +5,7 @@ if dri:
'dri/SConscript',
])
-if env['x11'] and not dri and platform != 'winddk':
+if 'xlib' in env['drivers'] and not dri:
SConscript([
'xlib/SConscript',
])