summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-08-10 13:09:46 (GMT)
committerKevin Smith <kevin.smith@isode.com>2016-08-23 08:14:09 (GMT)
commitb429450dc59c4ee4011b6b10a0af535a9003bb2e (patch)
tree5d7420c335973eb795ae07ea6f98cc96ee853d58 /Swift
parentff6034574d984f2d201c033efc00faeae055691e (diff)
downloadswift-b429450dc59c4ee4011b6b10a0af535a9003bb2e.zip
swift-b429450dc59c4ee4011b6b10a0af535a9003bb2e.tar.bz2
Do not require debug MSVC runtime for non optimized builds
This allows building Swift with debug symbols and the non-debug MSVC dynamic runtime. Test-Information: scons debug=1 optimize=0 and ./scons debug=1 optimize=1 both build and Swift runs in both configurations on Windows 8 with VS 2013. Change-Id: I47d75916963c4e64732c547bc7dfb322096d6189
Diffstat (limited to 'Swift')
-rw-r--r--Swift/QtUI/SConscript2
1 files changed, 0 insertions, 2 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 777797c..200bd58 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -78,8 +78,6 @@ if env["PLATFORM"] == "win32" :
if myenv.get("HAVE_SCHANNEL", 0) :
myenv.Append(LIBS = "Cryptui")
myenv.Append(CPPDEFINES = "HAVE_SCHANNEL")
- if env["debug"] and not env["optimize"]:
- myenv.Append(LINKFLAGS = ["/NODEFAULTLIB:msvcrt"])
myenv.WriteVal("DefaultTheme.qrc", myenv.Value(generateQRCTheme(myenv.Dir("#/Swift/resources/themes/Default"), "Default")))