Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-08-12 07:11:03 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-08-12 07:11:03 (GMT) |
| commit | 2a28c1be20477ddf25a233ee34c991951295058b (patch) | |
| tree | a0cfee69d0c7e7d647e8b79bf02be88441d2a938 | |
| parent | e0a32606424be3bacc1b48ca870aeef16199be04 (diff) | |
| download | swift-2a28c1be20477ddf25a233ee34c991951295058b.zip swift-2a28c1be20477ddf25a233ee34c991951295058b.tar.bz2 | |
More windows tweaks.
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | Swift/QtUI/SConscript | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -116,6 +116,8 @@ if env["PLATFORM"] == "win32" : env["MSVC_BATCH"] = 1 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'] + #env["LINKFLAGS"] = ["/SUBSYSTEM:WINDOWS", "/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'"] + env["LINKFLAGS"] = ["/SUBSYSTEM:CONSOLE"] ################################################################################ diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index b98ecee..4b6bcba 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -112,8 +112,7 @@ if env["PLATFORM"] == "win32" : File(os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll")), ]) - myenv.Append(NSIS_OPTIONS = [ + myenv.Nsis("../Packaging/nsis/swift.nsi", NSIS_OPTIONS = [ "/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"", "/DbuildDate=" + datetime.date.today().strftime("%Y%m%d") ]) - myenv.Nsis("../Packaging/nsis/swift.nsi") |