From fa500ac6870324e10ae90656c03a88666200634b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Thu, 13 Dec 2012 12:35:55 +0100
Subject: Use /Zi instead of /Z7 for debugging symbols.

Change-Id: I60e34c2dd03bfa52949b7781a922959604d15bee

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
@@ -149,7 +149,7 @@ if env["target"] == "xcode" and os.environ["CONFIGURATION"] == "Release" :
 
 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"])
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
@@ -7,11 +7,6 @@ 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"
-- 
cgit v0.10.2-6-g49f6