aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/SConscript
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-02-14 14:46:43 +0000
committermarha <marha@users.sourceforge.net>2011-02-14 14:46:43 +0000
commit0f63823d473bf956ec5bddf06da6e4b591e994f8 (patch)
treec8fa2b17686616a7443c583e09bbf6eceec883c2 /mesalib/src/SConscript
parent9acb2b3cd11b530debce5008074fa03587ac3331 (diff)
parent026b85e62b3d8812afb5f04df29aeac28c52b331 (diff)
downloadvcxsrv-0f63823d473bf956ec5bddf06da6e4b591e994f8.tar.gz
vcxsrv-0f63823d473bf956ec5bddf06da6e4b591e994f8.tar.bz2
vcxsrv-0f63823d473bf956ec5bddf06da6e4b591e994f8.zip
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/SConscript')
-rw-r--r--mesalib/src/SConscript56
1 files changed, 32 insertions, 24 deletions
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')
+