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
parent173ad94b6edfafa614700e7ccb66f7d30ef98a10 (diff)
downloadswift-contrib-8e11206adcdff6f7781b4f12bac6eeb8c3cba65a.zip
swift-contrib-8e11206adcdff6f7781b4f12bac6eeb8c3cba65a.tar.bz2
More build fixes.
-rw-r--r--Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript4
-rw-r--r--Limber/SConscript4
-rw-r--r--QA/Checker/SConscript6
3 files changed, 7 insertions, 7 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"])
diff --git a/Limber/SConscript b/Limber/SConscript
index d49fc94..13bc0df 100644
--- a/Limber/SConscript
+++ b/Limber/SConscript
@@ -8,8 +8,8 @@ if env["SCONS_STAGE"] == "flags" :
elif env["SCONS_STAGE"] == "build" :
libenv = env.Clone()
- libenv.MergeFlags(env["BOOST_FLAGS"])
- libenv.MergeFlags(env["SWIFTEN_FLAGS"])
+ libenv.UseFlags(env["SWIFTEN_FLAGS"])
+ libenv.UseFlags(env["SWIFTEN_DEP_FLAGS"])
libenv.StaticLibrary("Limber", [
"Server/ServerFromClientSession.cpp",
"Server/ServerSession.cpp",
diff --git a/QA/Checker/SConscript b/QA/Checker/SConscript
index 1d0d255..d180af2 100644
--- a/QA/Checker/SConscript
+++ b/QA/Checker/SConscript
@@ -11,7 +11,7 @@ if env["TEST"] :
if env["SCONS_STAGE"] == "build" :
checker_env = env.Clone()
- checker_env.MergeFlags(env["SWIFTEN_FLAGS"])
- checker_env.MergeFlags(env["BOOST_FLAGS"])
- checker_env.MergeFlags(env["CPPUNIT_FLAGS"])
+ checker_env.UseFlags(env["SWIFTEN_FLAGS"])
+ checker_env.UseFlags(env["BOOST_FLAGS"])
+ checker_env.UseFlags(env["CPPUNIT_FLAGS"])
checker_env.Library("Checker", ["checker.cpp", "IO.cpp"])