summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-06-18 11:18:53 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-06-18 11:18:53 (GMT)
commitba4393a545d1b8a9a220f920f2257691dc59fa39 (patch)
tree1895e1174a47d4f5736300f4f46bf0008d819ee8
parent2d8b89074c21627bd2c9c94357ca158868937da2 (diff)
downloadswift-contrib-ba4393a545d1b8a9a220f920f2257691dc59fa39.zip
swift-contrib-ba4393a545d1b8a9a220f920f2257691dc59fa39.tar.bz2
MergeFlags->UseFlags in Slimber.
-rw-r--r--Slimber/CLI/SConscript18
1 files changed, 9 insertions, 9 deletions
diff --git a/Slimber/CLI/SConscript b/Slimber/CLI/SConscript
index 422b56c..ae17e75 100644
--- a/Slimber/CLI/SConscript
+++ b/Slimber/CLI/SConscript
@@ -2,15 +2,15 @@ Import("env")
myenv = env.Clone()
myenv.UseFlags(env["LIMBER_FLAGS"])
-myenv.MergeFlags(env["SLIMBER_FLAGS"])
-myenv.MergeFlags(env["SWIFTOOLS_FLAGS"])
-myenv.MergeFlags(env["SWIFTEN_FLAGS"])
-myenv.MergeFlags(env["LIBIDN_FLAGS"])
-myenv.MergeFlags(env["BOOST_FLAGS"])
-myenv.MergeFlags(env.get("LIBXML_FLAGS", {}))
-myenv.MergeFlags(env.get("EXPAT_FLAGS", {}))
-myenv.MergeFlags(env.get("AVAHI_FLAGS", {}))
-myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
+myenv.UseFlags(env["SLIMBER_FLAGS"])
+myenv.UseFlags(env["SWIFTOOLS_FLAGS"])
+myenv.UseFlags(env["SWIFTEN_FLAGS"])
+myenv.UseFlags(env["LIBIDN_FLAGS"])
+myenv.UseFlags(env["BOOST_FLAGS"])
+myenv.UseFlags(env.get("LIBXML_FLAGS", {}))
+myenv.UseFlags(env.get("EXPAT_FLAGS", {}))
+myenv.UseFlags(env.get("AVAHI_FLAGS", {}))
+myenv.UseFlags(myenv["PLATFORM_FLAGS"])
myenv.Program("slimber", [
"main.cpp",