Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-04-11 21:09:11 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-04-11 21:09:11 (GMT) |
| commit | 4c0cec9c9b58f823ef92cbf55e2138e82665beef (patch) | |
| tree | b19452575097677714829707a9882b4306b703ed /BuildTools | |
| parent | 794008696390db0e733f06615be4c1ef6b3812f7 (diff) | |
| download | swift-4c0cec9c9b58f823ef92cbf55e2138e82665beef.zip swift-4c0cec9c9b58f823ef92cbf55e2138e82665beef.tar.bz2 | |
Don't add the manifest for MS Visual Studio 2010.
This is only a temporary workaround. It seems MSVS 2010 no longer
silently ignores missing .manifest files, so we should find out when
the .manifest is generated, and in that case add the mt.exe step.
Diffstat (limited to 'BuildTools')
| -rw-r--r-- | BuildTools/SCons/SConstruct | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index 4c35123..5d6e6be 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -109,8 +109,10 @@ if env.get("coverage", 0) : if env["PLATFORM"] == "win32" : env.Append(LIBS = ["user32", "dnsapi", "ws2_32", "wsock32"]) env.Append(CCFLAGS = ["/EHsc", "/nologo"]) - env["LINKCOM"] = [env["LINKCOM"], 'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;1'] - env["SHLINKCOM"] = [env["SHLINKCOM"], 'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;2'] + # FIXME: We should find a decent solution for MSVS 10 + if int(env["MSVS_VERSION"].split(".")[0]) < 10 : + env["LINKCOM"] = [env["LINKCOM"], 'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;1'] + env["SHLINKCOM"] = [env["SHLINKCOM"], 'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;2'] if env["PLATFORM"] == "darwin" : env.Append(FRAMEWORKS = ["IOKit", "AppKit"]) |