X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2FSConscript;h=d5cde1c96423cc79f2024c70d034ab27dc7c3072;hb=8aac5d123c4636fad5e9d70c3a6706aaa6f1f240;hp=5440acd1351f57de3064b6890346f456d2fcf49f;hpb=5340b6dff73a0a23531ce2a5f28fba8303adab6e;p=mesa.git

diff --git a/src/SConscript b/src/SConscript
index 5440acd1351..d5cde1c9642 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -1,11 +1,24 @@
 Import('*')
 
-SConscript('gallium/SConscript')
+if env['platform'] == 'windows':
+    SConscript('getopt/SConscript')
+
+SConscript('glsl/SConscript')
+# When env['gles'] is set, the targets defined in mapi/glapi/SConscript are not
+# used.  libgl-xlib and libgl-gdi adapt themselves to use the targets defined
+# in mapi/glapi-shared/SConscript.  mesa/SConscript also adapts itself to
+# enable OpenGL ES support.
+SConscript('mapi/glapi/SConscript')
+SConscript('mesa/SConscript')
+
+SConscript('mapi/vgapi/SConscript')
 
-if 'mesa' in env['statetrackers']:
-	SConscript('mesa/SConscript')
+if env['platform'] != 'embedded':
+    SConscript('egl/main/SConscript')
+    SConscript('glut/glx/SConscript')
 
-SConscript('gallium/winsys/SConscript')
+    if env['gles']:
+        SConscript('mapi/shared-glapi/SConscript')
+
+SConscript('gallium/SConscript')
 
-SConscript('glut/glx/SConscript')
-SConscript('glew/SConscript')