diff options
author | José Fonseca <jfonseca@vmware.com> | 2010-08-26 06:40:49 +0100 |
---|---|---|
committer | José Fonseca <jfonseca@vmware.com> | 2010-08-26 06:44:34 +0100 |
commit | c32f87c39ce2b2e0ac6ae93d3bd5f286bf345613 (patch) | |
tree | 74c07b0a3685d6672255108ff91b1f55c4438edd | |
parent | 58cfbd697d2a6ca8d00ce17b2783023bc3256019 (diff) |
scons: Fix old script compatability logic.
Sconscript could be invoked twice if specified in the command line.
-rw-r--r-- | src/gallium/targets/SConscript | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/gallium/targets/SConscript b/src/gallium/targets/SConscript index f8276b15558..e447d093610 100644 --- a/src/gallium/targets/SConscript +++ b/src/gallium/targets/SConscript @@ -1,18 +1,13 @@ import os Import('*') - + # Compatibility with old build scripts: # if 'mesa' in env['statetrackers']: - if 'xlib' in env['winsys']: - SConscript([ - 'libgl-xlib/SConscript', - ]) - - if 'gdi' in env['winsys']: - SConscript([ - 'libgl-gdi/SConscript', - ]) + if 'xlib' in env['winsys'] and 'libgl-xlib' not in env['targets']: + env['targets'].append('libgl-xlib') + if 'gdi' in env['winsys'] and 'libgl-gdi' not in env['targets']: + env['targets'].append('libgl-gdi') if not 'graw-xlib' in env['targets'] and not 'graw-null' in env['targets'] and not env['msvc']: # XXX: disable until MSVC can link correctly |