Mesa (master): scons: Fix old script compatability logic.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Thu Aug 26 05:45:01 UTC 2010
Module: Mesa
Branch: master
Commit: c32f87c39ce2b2e0ac6ae93d3bd5f286bf345613
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c32f87c39ce2b2e0ac6ae93d3bd5f286bf345613
Author: José Fonseca <jfonseca at vmware.com>
Date: Thu Aug 26 06:40:49 2010 +0100
scons: Fix old script compatability logic.
Sconscript could be invoked twice if specified in the command line.
---
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 f8276b1..e447d09 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
More information about the mesa-commit
mailing list