Merge remote branch 'origin/master' into pipe-video

[mesa.git] / src / SConscript

diff --git a/src/SConscript b/src/SConscript
index 5b099438940bd276faef2ad02a1800c335be9978..c42d9bff2d7fcd36f90be02985f7f5987c7a6ca2 100644 (file)
--- a/src/SConscript
+++ b/src/SConscript
@@ -1,7 +1,17 @@
 Import('*')
 
-SConscript([
-       'gallium/SConscript',
-       'mesa/SConscript',
-       'gallium/winsys/SConscript',
-])
+SConscript('mapi/vgapi/SConscript')
+
+if env['platform'] == 'windows':
+    SConscript('egl/main/SConscript')
+    SConscript('talloc/SConscript')
+
+SConscript('glsl/SConscript')
+SConscript('mapi/glapi/SConscript')
+SConscript('mesa/SConscript')
+
+if env['platform'] != 'embedded':
+    SConscript('glut/glx/SConscript')
+
+SConscript('gallium/SConscript')
+