X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=src%2FSConscript;h=6d7bd6cd6ece9be89fc48983fc4a66223bb22f65;hp=cf6db730da24c4c3725068ede845848df71d00ef;hb=2699fce0d69db5158427c8b6c8194b2eefc5e58b;hpb=8f3bdeaad610d7d5a5c6e73e1e9c721219595754;ds=sidebyside

diff --git a/src/SConscript b/src/SConscript
index cf6db730da2..6d7bd6cd6ec 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -1,12 +1,34 @@
 Import('*')
 
+
+if env['platform'] == 'windows':
+    SConscript('getopt/SConscript')
+
 SConscript('glsl/SConscript')
 
-if 'mesa' in env['statetrackers']:
-    SConscript('mesa/SConscript')
+if env['hostonly']:
+    # We are just compiling the things necessary on the host for cross
+    # compilation
+    Return()
 
-SConscript('gallium/SConscript')
 
-if platform != 'embedded':
+# 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 env['platform'] != 'embedded':
+    SConscript('glx/SConscript')
+    SConscript('egl/main/SConscript')
+    SConscript('glu/sgi/SConscript')
     SConscript('glut/glx/SConscript')
-    SConscript('glew/SConscript')
+
+    if env['gles']:
+        SConscript('mapi/shared-glapi/SConscript')
+
+SConscript('gallium/SConscript')
+