Merge branch '7.8' into master

[mesa.git] / src / SConscript

diff --git a/src/SConscript b/src/SConscript
index e2ee50dd6ef06cb500a803838d6a64ea94ed5a2a..cf6db730da24c4c3725068ede845848df71d00ef 100644 (file)
--- a/src/SConscript
+++ b/src/SConscript
@@ -1,8 +1,12 @@
 Import('*')
 
-SConscript('gallium/SConscript')
+SConscript('glsl/SConscript')
+
+if 'mesa' in env['statetrackers']:
+    SConscript('mesa/SConscript')
 
-if 'mesa' in env['state_trackers']:
-       SConscript('mesa/SConscript')
+SConscript('gallium/SConscript')
 
-SConscript('gallium/winsys/SConscript')
+if platform != 'embedded':
+    SConscript('glut/glx/SConscript')
+    SConscript('glew/SConscript')