diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-01 10:46:14 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-01 10:46:14 +0000 |
| commit | d4a8565009962e162d86a9c4ae24062a3fa12025 (patch) | |
| tree | bcd249c3c523b23a6350b1d6b5a2cff7518cdb0e /mesalib/src/SConscript | |
| parent | 6751d9898be671d253d6f7b0806cd4b10daaaf85 (diff) | |
| parent | 0bf07d32cbd460220c67d726900772cf3692746d (diff) | |
| download | vcxsrv-d4a8565009962e162d86a9c4ae24062a3fa12025.tar.gz vcxsrv-d4a8565009962e162d86a9c4ae24062a3fa12025.tar.bz2 vcxsrv-d4a8565009962e162d86a9c4ae24062a3fa12025.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/SConscript')
| -rw-r--r-- | mesalib/src/SConscript | 52 |
1 files changed, 24 insertions, 28 deletions
diff --git a/mesalib/src/SConscript b/mesalib/src/SConscript index f86447c08..d5cde1c96 100644 --- a/mesalib/src/SConscript +++ b/mesalib/src/SConscript @@ -1,28 +1,24 @@ -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')
-
+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') + |