scons: MacOSX build fixes.

[mesa.git] / src / SConscript

diff --git a/src/SConscript b/src/SConscript
index 201812c5ac3f1199c79c50ff34c203724f28278a..91d1253adfda1c6e2245b82ad609cee7e5518f57 100644 (file)
--- a/src/SConscript
+++ b/src/SConscript
@@ -1,21 +1,34 @@
 Import('*')
 
+
 if env['platform'] == 'windows':
     SConscript('getopt/SConscript')
-    SConscript('talloc/SConscript')
-else:
-    talloc = 'talloc'
-    Export('talloc')
 
 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 not env['embedded']:
+    if env['platform'] not in ['windows', 'darwin']:
+        SConscript('glx/SConscript')
+        SConscript('egl/main/SConscript')
+        SConscript('glu/sgi/SConscript')
+
+    if env['gles']:
+        SConscript('mapi/shared-glapi/SConscript')
 
 SConscript('gallium/SConscript')