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

[mesa.git] / src / SConscript

diff --git a/src/SConscript b/src/SConscript
index d5cde1c96423cc79f2024c70d034ab27dc7c3072..7b614daeea1cf18f0b28e43628d901fb8893108a 100644 (file)
--- a/src/SConscript
+++ b/src/SConscript
@@ -1,9 +1,17 @@
 Import('*')
 
+
 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()
+
+
 # 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
@@ -15,6 +23,7 @@ SConscript('mapi/vgapi/SConscript')
 
 if env['platform'] != 'embedded':
     SConscript('egl/main/SConscript')
+    SConscript('glu/sgi/SConscript')
     SConscript('glut/glx/SConscript')
 
     if env['gles']: