diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-14 07:54:15 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-14 07:54:15 +0000 |
| commit | 8b668e29799ccd203f12719c6ef92c08027f6592 (patch) | |
| tree | 4674c131d75a7c6e79418d2468e9c9467266550e /mesalib/src/SConscript | |
| parent | dc54712d6b67dac7fc745cf3b9019b2c4c81f193 (diff) | |
| parent | 175af178d1500ccafa7e7026959c138f5b8d9312 (diff) | |
| download | vcxsrv-8b668e29799ccd203f12719c6ef92c08027f6592.tar.gz vcxsrv-8b668e29799ccd203f12719c6ef92c08027f6592.tar.bz2 vcxsrv-8b668e29799ccd203f12719c6ef92c08027f6592.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/SConscript')
| -rw-r--r-- | mesalib/src/SConscript | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/mesalib/src/SConscript b/mesalib/src/SConscript index f730151c2..201812c5a 100644 --- a/mesalib/src/SConscript +++ b/mesalib/src/SConscript @@ -1,18 +1,21 @@ -Import('*')
-
-if env['platform'] == 'windows':
- SConscript('getopt/SConscript')
- SConscript('talloc/SConscript')
-
-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') +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') + |