diff options
author | Gary Oberbrunner <garyo@oberbrunner.com> | 2012-05-06 21:10:59 -0400 |
---|---|---|
committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2012-05-06 21:10:59 -0400 |
commit | 40ce512899a0840fd03e2a642fd2209f2fef7cb1 (patch) | |
tree | bac0a265a5cc6e55afe142d9ee36583f7f420751 | |
parent | 7da53cbc356889f9b1f2593156770cef8f87dd66 (diff) | |
download | scons-40ce512899a0840fd03e2a642fd2209f2fef7cb1.tar.gz |
MSVC11 needs PCH objects added to the link line.
Update msvc linker emitter to add the PCH object if not already present.
-rw-r--r-- | src/engine/SCons/Tool/mslink.py | 11 | ||||
-rw-r--r-- | test/MSVC/pch-spaces-subdir.py | 170 |
2 files changed, 95 insertions, 86 deletions
diff --git a/src/engine/SCons/Tool/mslink.py b/src/engine/SCons/Tool/mslink.py index 07af49ec..35c9de6f 100644 --- a/src/engine/SCons/Tool/mslink.py +++ b/src/engine/SCons/Tool/mslink.py @@ -159,6 +159,7 @@ def prog_emitter(target, source, env): SCons.Tool.msvc.validate_vars(env) extratargets = [] + extrasources = [] exe = env.FindIxes(target, "PROGPREFIX", "PROGSUFFIX") if not exe: @@ -178,7 +179,15 @@ def prog_emitter(target, source, env): extratargets.append(pdb) target[0].attributes.pdb = pdb - return (target+extratargets,source) + if version_num >= 11.0 and env.get('PCH', 0): + # MSVC 11 and above need the PCH object file to be added to the link line, + # otherwise you get link error LNK2011. + pchobj = SCons.Util.splitext(str(env['PCH']))[0] + '.obj' + # print "prog_emitter, version %s, appending pchobj %s"%(version_num, pchobj) + if pchobj not in extrasources: + extrasources.append(pchobj) + + return (target+extratargets,source+extrasources) def RegServerFunc(target, source, env): if 'register' in env and env['register']: diff --git a/test/MSVC/pch-spaces-subdir.py b/test/MSVC/pch-spaces-subdir.py index 90d3b51a..991627ff 100644 --- a/test/MSVC/pch-spaces-subdir.py +++ b/test/MSVC/pch-spaces-subdir.py @@ -1,85 +1,85 @@ -#!/usr/bin/env python
-#
-# __COPYRIGHT__
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
-"""
-Verify PCH works if variant dir has spaces in its name
-"""
-
-import sys
-import time
-
-import TestSCons
-
-test = TestSCons.TestSCons(match = TestSCons.match_re)
-
-if sys.platform != 'win32':
- msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform
- test.skip_test(msg)
-
-test.write('Main.cpp', """\
-#include "Precompiled.h"
-
-int main()
-{
- return testf();
-}
-""")
-
-test.write('Precompiled.cpp', """\
-#include "Precompiled.h"
-""")
-
-test.write('Precompiled.h', """\
-#pragma once
-
-int testf()
-{
- return 0;
-}
-""")
-
-test.write('SConstruct', """\
-SConscript('SConscript', variant_dir='Release Output', duplicate=0)
-""")
-
-test.write('SConscript', """\
-env = Environment()
-
-env['PCHSTOP'] = 'Precompiled.h'
-env['PCH'] = env.PCH('Precompiled.cpp')[0]
-
-env.Program('Main.cpp')
-""")
-
-test.run(arguments='.', stderr=None)
-
-test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
+#!/usr/bin/env python +# +# __COPYRIGHT__ +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +""" +Verify PCH works if variant dir has spaces in its name +""" + +import sys +import time + +import TestSCons + +test = TestSCons.TestSCons(match = TestSCons.match_re) + +if sys.platform != 'win32': + msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform + test.skip_test(msg) + +test.write('Main.cpp', """\ +#include "Precompiled.h" + +int main() +{ + return testf(); +} +""") + +test.write('Precompiled.cpp', """\ +#include "Precompiled.h" +""") + +test.write('Precompiled.h', """\ +#pragma once + +static int testf() +{ + return 0; +} +""") + +test.write('SConstruct', """\ +SConscript('SConscript', variant_dir='Release Output', duplicate=0) +""") + +test.write('SConscript', """\ +env = Environment() + +env['PCHSTOP'] = 'Precompiled.h' +env['PCH'] = env.PCH('Precompiled.cpp')[0] + +env.Program('Main.cpp') +""") + +test.run(arguments='.', stderr=None) + +test.pass_test() + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: |