summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-08-08 17:47:43 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-08-08 17:47:43 (GMT)
commit8e11206adcdff6f7781b4f12bac6eeb8c3cba65a (patch)
tree48578e265e5ab01d5614a89184f7f877a27586a5 /Documentation/SwiftenDevelopersGuide/Examples/EchoBot
parent173ad94b6edfafa614700e7ccb66f7d30ef98a10 (diff)
downloadswift-8e11206adcdff6f7781b4f12bac6eeb8c3cba65a.zip
swift-8e11206adcdff6f7781b4f12bac6eeb8c3cba65a.tar.bz2
More build fixes.
Diffstat (limited to 'Documentation/SwiftenDevelopersGuide/Examples/EchoBot')
-rw-r--r--Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript
index c6349bd..b267e80 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript
@@ -1,8 +1,8 @@
Import("env")
example_env = env.Clone()
-example_env.MergeFlags(example_env["SWIFTEN_FLAGS"])
-example_env.MergeFlags(example_env["SWIFTEN_DEP_FLAGS"])
+example_env.UseFlags(example_env["SWIFTEN_FLAGS"])
+example_env.UseFlags(example_env["SWIFTEN_DEP_FLAGS"])
for i in range(1,7) :
example_env.Program("EchoBot" + str(i), ["EchoBot" + str(i) + ".cpp"])