From 026b85e62b3d8812afb5f04df29aeac28c52b331 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sat, 12 Feb 2011 15:47:35 +0000
Subject: xkeyboard-config pixman xkbcompt mesa git update 12 Feb 2011

---
 mesalib/src/SConscript | 56 ++++++++++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 24 deletions(-)

(limited to 'mesalib/src/SConscript')

diff --git a/mesalib/src/SConscript b/mesalib/src/SConscript
index d5cde1c96..f5951fc9d 100644
--- a/mesalib/src/SConscript
+++ b/mesalib/src/SConscript
@@ -1,24 +1,32 @@
-Import('*')
-
-if env['platform'] == 'windows':
-    SConscript('getopt/SConscript')
-
-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')
-
+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
+# 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')
+
-- 
cgit v1.2.3