1 files changed, 11 insertions, 5 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index 3b21dde..411fb7d 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -37,7 +37,8 @@ if os.name == "mac" or (os.name == "posix" and os.uname()[0] == "Darwin"):
     vars.Add(BoolVariable("mac105", "Link against the 10.5 frameworks", "no"))
     vars.Add(BoolVariable("mac106", "Link against the 10.6 frameworks", "no"))
 if os.name == "nt" :
-    vars.Add(PathVariable("vcredist", "MSVC redistributable dir", None, PathVariable.PathAccept))
+    vars.Add(PathVariable("vcredist", "MSVC redistributable path", None, PathVariable.PathAccept))
+    vars.Add(PathVariable("vcredistdir", "MSVC redistributable dir", None, PathVariable.PathAccept))
 if os.name == "nt" :
     vars.Add(PathVariable("wix_bindir", "Path to WiX binaries", "", PathVariable.PathAccept))
 if os.name == "nt" :
@@ -107,6 +108,7 @@ vars.Add(BoolVariable("enable_variants", "Build in a separate dir under build/,
 vars.Add(BoolVariable("experimental_ft", "Build experimental file transfer", "yes"))
 vars.Add(BoolVariable("experimental", "Build experimental features", "no"))
 vars.Add(BoolVariable("set_iterator_debug_level", "Set _ITERATOR_DEBUG_LEVEL=0", "yes"))
+vars.Add(EnumVariable("msvc_runtime", "Choose MSVC runtime library", "MD", ["MT", "MTd", "MD", "MDd"]))
 vars.Add(BoolVariable("unbound", "Build bundled ldns and unbound. Use them for DNS lookup.", "no"))
 vars.Add(BoolVariable("check_headers", "Independently build compilation units for all Swiften headers for detecting missing dependencies.", "no"))
 vars.Add("win_target_arch", "Target architecture for Windows builds. x86 for 32-bit (default) or x86_64 for 64-bit.", "x86")
@@ -249,6 +251,9 @@ for flags_type in ["ccflags", "cxxflags", "linkflags"] :
 # where you need it
 env["OBJCCFLAGS"] = []
 
+if env["PLATFORM"] != "win32" :
+    env.AppendUnique(CCFLAGS=['-isystem', Dir('#').abspath + '/Backport/'])
+
 # Compile code as C++11
 if env["PLATFORM"] != "win32" :
     env.Append(CXXFLAGS = ["-std=c++11"])
@@ -272,11 +277,13 @@ if env["debug"] :
         if env["set_iterator_debug_level"] :
             env.Append(CPPDEFINES = ["_ITERATOR_DEBUG_LEVEL=0"])
         env.Append(LINKFLAGS = ["/OPT:NOREF"])
-        env.Append(CCFLAGS = ["/MD"])
     else :
         env.Append(CCFLAGS = ["-g"])
-elif env["PLATFORM"] == "win32" :
-    env.Append(CCFLAGS = ["/MD"])
+
+if env["PLATFORM"] == "win32" :
+    env.AppendUnique(CCFLAGS = ["/{}".format(env.get("msvc_runtime"))])
+    # debug builds against debug MSVC runtime can cause some more sections in the object file
+    env.AppendUnique(CCFLAGS = ["/bigobj"])
 
 if env.get("universal", 0) :
     assert(env["PLATFORM"] == "darwin")
@@ -363,7 +370,6 @@ else :
             "-Wno-direct-ivar-access", # Obj-C code warning
             "-Wno-potentially-evaluated-expression", # Caused due to calling shared_ptr::get() inside typeid()
 
-            "-Wno-inconsistent-missing-destructor-override", # FIXME: fix source code issues regarding this warning later
             "-Wno-shadow-field", # FIXME: fix source code issues regarding this warning later
             "-Wno-unused-template", # FIXME: fix source code issues regarding this warning later
             ])