Merged in feblot/scons-feblot/pchdll (pull request #232)

VC11 needs PCH objects added to the link line also for shared libraries.

2 files changed, 87 insertions, 0 deletions

diff --git a/src/engine/SCons/Tool/mslink.py b/src/engine/SCons/Tool/mslink.py
index 37af34e..827161e 100644
--- a/src/engine/SCons/Tool/mslink.py
+++ b/src/engine/SCons/Tool/mslink.py
@@ -129,6 +129,14 @@ def _dllEmitter(target, source, env, paramtp):
         extratargets.append(pdb)
         target[0].attributes.pdb = pdb
 
+    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)
+
     if not no_import_lib and \
        not env.FindIxes(target, "LIBPREFIX", "LIBSUFFIX"):
         # Append an import library to the list of targets.
diff --git a/test/MSVC/pch-basics.py b/test/MSVC/pch-basics.py
new file mode 100644
index 0000000..45735ed
--- /dev/null
+++ b/test/MSVC/pch-basics.py
@@ -0,0 +1,79 @@
+#!/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 to build a simple exe and a simple dll.
+"""
+ 
+import time
+ 
+import TestSCons
+ 
+test = TestSCons.TestSCons(match = TestSCons.match_re)
+ 
+test.skip_if_not_msvc()
+ 
+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', """\
+env = Environment()
+ 
+env['PCHSTOP'] = 'Precompiled.h'
+env['PCH'] = env.PCH('Precompiled.cpp')[0]
+ 
+env.SharedLibrary('pch_dll', 'Main.cpp')
+env.Program('pch_exe', '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: