summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Tool/mingw.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2004-04-04 04:01:53 (GMT)
committerSteven Knight <knight@baldmt.com>2004-04-04 04:01:53 (GMT)
commit30f01a9a0339978e15115cd2ad8fd169d88e1ab1 (patch)
tree09d153a86945df53d71c32d53e865c6e2fd3c1b4 /src/engine/SCons/Tool/mingw.py
parente3395e16f968f033c77090aa8b4212c0f89ebf6a (diff)
downloadSCons-30f01a9a0339978e15115cd2ad8fd169d88e1ab1.zip
SCons-30f01a9a0339978e15115cd2ad8fd169d88e1ab1.tar.gz
SCons-30f01a9a0339978e15115cd2ad8fd169d88e1ab1.tar.bz2
Allow a list of emitters to be called in sequence. (Chad Austin)
Diffstat (limited to 'src/engine/SCons/Tool/mingw.py')
-rw-r--r--src/engine/SCons/Tool/mingw.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/mingw.py b/src/engine/SCons/Tool/mingw.py
index 18fa79e..fa46652 100644
--- a/src/engine/SCons/Tool/mingw.py
+++ b/src/engine/SCons/Tool/mingw.py
@@ -123,7 +123,7 @@ def generate(env):
env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS -shared')
env['SHLINKCOM'] = shlib_action
- env['SHLIBEMITTER']= shlib_emitter
+ env.Append(SHLIBEMITTER = [shlib_emitter])
env['LINK'] = 'g++'
env['AS'] = 'as'
env['WIN32DEFPREFIX'] = ''
@@ -133,7 +133,7 @@ def generate(env):
env['RC'] = 'windres'
env['RCFLAGS'] = SCons.Util.CLVar('')
- env['RCINCFLAGS'] = SCons.Util.CLVar('$( ${_concat(RCINCPREFIX, CPPPATH, RCINCSUFFIX, __env__, RDirs)} $)')
+ env['RCINCFLAGS'] = '$( ${_concat(RCINCPREFIX, CPPPATH, RCINCSUFFIX, __env__, RDirs)} $)'
env['RCINCPREFIX'] = '--include-dir '
env['RCINCSUFFIX'] = ''
env['RCCOM'] = '$RC $RCINCFLAGS $RCFLAGS -i $SOURCE -o $TARGET'