Swiftdiff options
| -rw-r--r-- | BuildTools/SCons/SConscript.boot | 2 | ||||
| -rw-r--r-- | Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot index acbe736..66811ad 100644 --- a/BuildTools/SCons/SConscript.boot +++ b/BuildTools/SCons/SConscript.boot @@ -140,25 +140,25 @@ env["OBJCCFLAGS"] = [] if env["optimize"] : if env["PLATFORM"] == "win32" : env.Append(CCFLAGS = ["/O2"]) else : env.Append(CCFLAGS = ["-O2"]) if env["target"] == "xcode" and os.environ["CONFIGURATION"] == "Release" : env.Append(CCFLAGS = ["-Os"]) if env["debug"] : if env["PLATFORM"] == "win32" : - env.Append(CCFLAGS = ["/Z7"]) + env.Append(CCFLAGS = ["/Zi"]) env.Append(LINKFLAGS = ["/DEBUG"]) 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"]) else : env.Append(CCFLAGS = ["-g"]) elif env["PLATFORM"] == "win32" : env.Append(CCFLAGS = ["/MD"]) diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript index 84cc80b..aa9f691 100644 --- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript +++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript @@ -1,26 +1,21 @@ Import("env") example_env = env.Clone() example_env.UseFlags(example_env["SWIFTEN_FLAGS"]) example_env.UseFlags(example_env["SWIFTEN_DEP_FLAGS"]) # Precompile Swiften header # This is useful to slightly speed up compilation. if example_env["PLATFORM"] == "win32": - # Precompiled headers don't work with /Z7. We don't really need /Z7 here, so using - # the more standard /Zi. - if example_env["debug"] : - example_env.Replace(CCFLAGS = [flag for flag in env["CCFLAGS"] if flag != "/Z7"]) - example_env.Append(CCFLAGS = "/Zi") example_env.WriteVal("Swiften.cpp", example_env.Value("#include <Swiften/Swiften.h>\n")) example_env["PCH"] = example_env.PCH("Swiften.cpp")[0] example_env["PCHSTOP"] = "Swiften/Swiften.h" for i in range(1,7) : example_env.Program("EchoBot" + str(i), ["EchoBot" + str(i) + ".cpp"]) example_env.Program("EchoComponent", "EchoComponent.cpp") # C++0x cpp0x = False cpp0x_env = example_env.Clone() if env["PLATFORM"] == "win32" : |