Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video

[mesa.git] / src / SConscript

diff --git a/src/SConscript b/src/SConscript
index cf6db730da24c4c3725068ede845848df71d00ef..c3e34be6f760f020ad2b797d6d937fcd98da21e4 100644 (file)
--- a/src/SConscript
+++ b/src/SConscript
@@ -1,12 +1,19 @@
 Import('*')
 
-SConscript('glsl/SConscript')
+if 'egl' in env['statetrackers']:
+    SConscript('mapi/vgapi/SConscript')
+    SConscript('egl/main/SConscript')
 
 if 'mesa' in env['statetrackers']:
+    if platform == 'windows':
+        SConscript('talloc/SConscript')
+
+    SConscript('glsl/SConscript')
+    SConscript('mapi/glapi/SConscript')
     SConscript('mesa/SConscript')
 
+    if platform != 'embedded':
+        SConscript('glut/glx/SConscript')
+
 SConscript('gallium/SConscript')
 
-if platform != 'embedded':
-    SConscript('glut/glx/SConscript')
-    SConscript('glew/SConscript')