Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-08-10 13:09:46 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2016-08-23 08:14:09 (GMT) |
| commit | b429450dc59c4ee4011b6b10a0af535a9003bb2e (patch) | |
| tree | 5d7420c335973eb795ae07ea6f98cc96ee853d58 | |
| parent | ff6034574d984f2d201c033efc00faeae055691e (diff) | |
| download | swift-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
| -rw-r--r-- | BuildTools/SCons/SConscript.boot | 7 | ||||
| -rw-r--r-- | Swift/QtUI/SConscript | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot index 597690d..8379a58 100644 --- a/BuildTools/SCons/SConscript.boot +++ b/BuildTools/SCons/SConscript.boot @@ -248,11 +248,8 @@ if env["debug"] : env["PDB"] = '${TARGET.base}.pdb' if env["set_iterator_debug_level"] : env.Append(CPPDEFINES = ["_ITERATOR_DEBUG_LEVEL=0"]) - if env["optimize"] : - env.Append(LINKFLAGS = ["/OPT:NOREF"]) - env.Append(CCFLAGS = ["/MD"]) - else : - env.Append(CCFLAGS = ["/MDd"]) + env.Append(LINKFLAGS = ["/OPT:NOREF"]) + env.Append(CCFLAGS = ["/MD"]) else : env.Append(CCFLAGS = ["-g"]) elif env["PLATFORM"] == "win32" : 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"))) |