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

[mesa.git] / src / SConscript

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