Merge commit 'origin/master' into gallium-0.2

[mesa.git] / src / gallium / SConscript

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index d9c20e010075de13b9ba644d2ad20489799539fd..6a3e7e77ed83159d557c5949dafd5d51336f4787 100644 (file)
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -1,9 +1,29 @@
+import os
+
 Import('*')
 
-#env = env.Clone()
+env = env.Clone()
+
+auxiliaries = []
+
+Export('auxiliaries')
+
+
+if llvm:
+       SConscript(['auxiliary/gallivm/SConscript'])
 
 SConscript([
-       'softpipe/SConscript',
-       'i915simple/SConscript',
-       'i965simple/SConscript',
+       # NOTE: order matters!
+       'auxiliary/util/SConscript',
+       'auxiliary/rtasm/SConscript',
+       'auxiliary/tgsi/SConscript',
+       'auxiliary/cso_cache/SConscript',
+       'auxiliary/translate/SConscript',
+       'auxiliary/draw/SConscript',
+       'auxiliary/pipebuffer/SConscript',
 ])
+
+for driver in env['drivers']:
+       SConscript(os.path.join('drivers', driver, 'SConscript'))
+
+SConscript('state_trackers/python/SConscript')