diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-22 17:28:46 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-22 17:28:46 +0000 |
| commit | f544012f5c37fba02cae71b39a533f8296cdabb5 (patch) | |
| tree | 362b7ac783787d77962014f5f8e4e7c116de3f3f /mesalib/src/SConscript | |
| parent | 58eb5cd6de079f1f3ddf1edc2d436a24eb858dc2 (diff) | |
| parent | b8ffa56f8bda74a402eae0c89aadfda7b7db507f (diff) | |
| download | vcxsrv-f544012f5c37fba02cae71b39a533f8296cdabb5.tar.gz vcxsrv-f544012f5c37fba02cae71b39a533f8296cdabb5.tar.bz2 vcxsrv-f544012f5c37fba02cae71b39a533f8296cdabb5.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/SConscript')
| -rw-r--r-- | mesalib/src/SConscript | 49 |
1 files changed, 28 insertions, 21 deletions
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')
+
|