summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-02-04 14:24:19 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-02-04 14:24:19 (GMT)
commit6a931dc727a5581966425f9ec5d2ce5ddbbfe11a (patch)
tree89eff81a481825f086508e99a1cca2ab57d4f334 /Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript
parente9939e9958b0dae2dc6d2211b52dca5058869418 (diff)
downloadswift-6a931dc727a5581966425f9ec5d2ce5ddbbfe11a.zip
swift-6a931dc727a5581966425f9ec5d2ce5ddbbfe11a.tar.bz2
Added C++0x version of EchoBot.
Diffstat (limited to 'Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript')
-rw-r--r--Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript15
1 files changed, 14 insertions, 1 deletions
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript
index ca9ce62..036b29d 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript
@@ -6,5 +6,18 @@ example_env.MergeFlags(example_env["SWIFTEN_DEP_FLAGS"])
for i in range(1,7) :
example_env.Program("EchoBot" + str(i), ["EchoBot" + str(i) + ".cpp"])
-#example_env.Program("EchoBot0x", "EchoBot0x.cpp")
example_env.Program("EchoComponent", "EchoComponent.cpp")
+
+# C++0x
+cpp0x = False
+cpp0x_env = example_env.Clone()
+if env["PLATFORM"] == "win32" :
+ if int(env["MSVS_VERSION"].split(".")[0]) >= 10 :
+ cpp0x = True
+else :
+ if env["CCVERSION"].split(".") >= ["4", "5", "0"] :
+ cpp0x = True
+ cpp0x_env.Replace(CXXFLAGS = [flag for flag in env["CXXFLAGS"] if flag != "-Werror"])
+ cpp0x_env.Append(CXXFLAGS = ["-std=c++0x"])
+if cpp0x :
+ cpp0x_env.Program("EchoBot0x", "EchoBot0x.cpp")