Merge branch 'gallium-noconstbuf'

[mesa.git] / src / gallium / SConscript

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 32b7c2980ab7bd433a89c6b5554fb439164e6ef8..eea32b1314b1a28e4b906095a17c5f7bb14550a5 100644 (file)
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -2,28 +2,7 @@ import os
 
 Import('*')
 
-env = env.Clone()
-
-auxiliaries = []
-
-Export('auxiliaries')
-
-
-if llvm:
-       SConscript(['auxiliary/gallivm/SConscript'])
-
-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',
-       'auxiliary/indices/SConscript',
-       'auxiliary/rbug/SConscript',
-])
+SConscript('auxiliary/SConscript')
 
 for driver in env['drivers']:
        SConscript(os.path.join('drivers', driver, 'SConscript'))
@@ -31,6 +10,7 @@ for driver in env['drivers']:
 SConscript('state_trackers/python/SConscript')
 SConscript('state_trackers/glx/xlib/SConscript')
 SConscript('state_trackers/dri/SConscript')
+SConscript('state_trackers/xorg/SConscript')
 
 if platform == 'windows':
        SConscript('state_trackers/wgl/SConscript')