Merge branch 'mesa_7_7_branch'

[mesa.git] / src / gallium / SConscript

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index a08b4b830e108da2ec88094e3169310e2ca1f77d..eea32b1314b1a28e4b906095a17c5f7bb14550a5 100644 (file)
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -1,29 +1,16 @@
-Import('*')
-
-env = env.Clone()
+import os
 
-auxiliaries = []
-
-Export('auxiliaries')
+Import('*')
 
+SConscript('auxiliary/SConscript')
 
-SConscript([
-       # NOTE: order matters!
-       'auxiliary/util/SConscript',
-       'auxiliary/rtasm/SConscript',
-       'auxiliary/tgsi/SConscript',
-       'auxiliary/cso_cache/SConscript',
-       'auxiliary/draw/SConscript',
-       'auxiliary/pipebuffer/SConscript',
-])
+for driver in env['drivers']:
+       SConscript(os.path.join('drivers', driver, 'SConscript'))
 
-if llvm:
-       SConscript(['auxiliary/gallivm/SConscript'])
+SConscript('state_trackers/python/SConscript')
+SConscript('state_trackers/glx/xlib/SConscript')
+SConscript('state_trackers/dri/SConscript')
+SConscript('state_trackers/xorg/SConscript')
 
-SConscript([
-       'drivers/softpipe/SConscript',
-       'drivers/i915simple/SConscript',
-       'drivers/i965simple/SConscript',
-       'drivers/failover/SConscript',
-       #'drivers/cell/SConscript',
-])
+if platform == 'windows':
+       SConscript('state_trackers/wgl/SConscript')