X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2FSConscript;h=3c171552bed1b613e1466707de7fce999a7be26b;hb=52427f0ba703f933b70d669ae565c7aeb733236d;hp=8be84cddbe727df6187556b9fdda6a12bb31633c;hpb=6d25b9125ec1e66e0e255b0ee20fe18dfe1076fa;p=mesa.git

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 8be84cddbe7..3c171552bed 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -2,37 +2,29 @@ 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',
-	'auxiliary/vl/SConscript',
-])
+SConscript('auxiliary/SConscript')
 
 for driver in env['drivers']:
 	SConscript(os.path.join('drivers', driver, 'SConscript'))
 
+# Needed by some state trackers
+SConscript('winsys/sw/null/SConscript')
+
 SConscript('state_trackers/python/SConscript')
-SConscript('state_trackers/glx/xlib/SConscript')
-SConscript('state_trackers/dri/SConscript')
-SConscript('state_trackers/xorg/SConscript')
+if platform != 'embedded':
+	SConscript('state_trackers/glx/xlib/SConscript')
+	SConscript('state_trackers/dri/SConscript')
+	SConscript('state_trackers/xorg/SConscript')
+	SConscript('state_trackers/egl/SConscript')
+	SConscript('state_trackers/vega/SConscript')
 
 if platform == 'windows':
 	SConscript('state_trackers/wgl/SConscript')
+
+SConscript('winsys/SConscript')
+
+SConscript('targets/SConscript')
+
+if platform != 'embedded':
+	SConscript('tests/unit/SConscript')
+	SConscript('tests/graw/SConscript')