1 files changed, 28 insertions, 21 deletions
diff --git a/mesalib/src/SConscript b/mesalib/src/SConscript
index 201812c5a..f86447c08 100644
--- a/mesalib/src/SConscript
+++ b/mesalib/src/SConscript
@@ -1,21 +1,28 @@
-Import('*')
-
-if env['platform'] == 'windows':
-    SConscript('getopt/SConscript')
-    SConscript('talloc/SConscript')
-else:
-    talloc = 'talloc'
-    Export('talloc')
-
-SConscript('glsl/SConscript')
-SConscript('mapi/glapi/SConscript')
-SConscript('mesa/SConscript')
-
-SConscript('mapi/vgapi/SConscript')
-
-if env['platform'] != 'embedded':
-    SConscript('egl/main/SConscript')
-    SConscript('glut/glx/SConscript')
-
-SConscript('gallium/SConscript')
-
+Import('*')
+
+if env['platform'] == 'windows':
+    SConscript('getopt/SConscript')
+    SConscript('talloc/SConscript')
+else:
+    talloc = 'talloc'
+    Export('talloc')
+
+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 env['platform'] != 'embedded':
+    SConscript('egl/main/SConscript')
+    SConscript('glut/glx/SConscript')
+
+    if env['gles']:
+        SConscript('mapi/shared-glapi/SConscript')
+
+SConscript('gallium/SConscript')
+