1 files changed, 18 insertions, 3 deletions
diff --git a/src/SConscript b/src/SConscript
index c42d9bff2d7..f11894f2990 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -1,17 +1,32 @@
 Import('*')
 
-SConscript('mapi/vgapi/SConscript')
 
 if env['platform'] == 'windows':
-    SConscript('egl/main/SConscript')
-    SConscript('talloc/SConscript')
+    SConscript('getopt/SConscript')
 
 SConscript('glsl/SConscript')
+
+if env['hostonly']:
+    # We are just compiling the things necessary on the host for cross
+    # compilation
+    Return()
+
+
+# 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('egl/main/SConscript')
     SConscript('glut/glx/SConscript')
 
+    if env['gles']:
+        SConscript('mapi/shared-glapi/SConscript')
+
 SConscript('gallium/SConscript')