From b8ffa56f8bda74a402eae0c89aadfda7b7db507f Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sat, 22 Jan 2011 13:05:58 +0000
Subject: mesalib git update 22/1/2011
---
mesalib/src/SConscript | 49 ++++++++++++++++++++++++++++---------------------
1 file changed, 28 insertions(+), 21 deletions(-)
(limited to 'mesalib/src/SConscript')
diff --git a/mesalib/src/SConscript b/mesalib/src/SConscript
index 201812c5a..f86447c08 100644
--- a/mesalib/src/SConscript
+++ b/mesalib/src/SConscript
@@ -1,21 +1,28 @@
-Import('*')
-
-if env['platform'] == 'windows':
- SConscript('getopt/SConscript')
- SConscript('talloc/SConscript')
-else:
- talloc = 'talloc'
- Export('talloc')
-
-SConscript('glsl/SConscript')
-SConscript('mapi/glapi/SConscript')
-SConscript('mesa/SConscript')
-
-SConscript('mapi/vgapi/SConscript')
-
-if env['platform'] != 'embedded':
- SConscript('egl/main/SConscript')
- SConscript('glut/glx/SConscript')
-
-SConscript('gallium/SConscript')
-
+Import('*')
+
+if env['platform'] == 'windows':
+ SConscript('getopt/SConscript')
+ SConscript('talloc/SConscript')
+else:
+ talloc = 'talloc'
+ Export('talloc')
+
+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')
+
--
cgit v1.2.3