summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--SConstruct2
-rw-r--r--Swift/QtUI/SConscript3
2 files changed, 3 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct
index a6b64cf..463dc0b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -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")