Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-11-28 09:48:01 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-11-28 09:48:01 (GMT) |
| commit | 34eb7f55fbdd1566ee117738f3a423354ce1b45c (patch) | |
| tree | b239d9b7966f0b18e39aeeed3c1c76e720760f3c /Limber | |
| parent | 48ffe88bf768fd762a3bcb52717a9079ec803de5 (diff) | |
| download | swift-contrib-34eb7f55fbdd1566ee117738f3a423354ce1b45c.zip swift-contrib-34eb7f55fbdd1566ee117738f3a423354ce1b45c.tar.bz2 | |
Replace slightly-too-magic MergeFlags by our own UseFlags.
Diffstat (limited to 'Limber')
| -rw-r--r-- | Limber/SConscript | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Limber/SConscript b/Limber/SConscript index 0068233..e2fadac 100644 --- a/Limber/SConscript +++ b/Limber/SConscript @@ -3,12 +3,12 @@ Import("env") if env["SCONS_STAGE"] == "build" : myenv = env.Clone() myenv.BuildVersion("BuildVersion.h", project = "limber") - myenv.MergeFlags(env["SWIFTEN_FLAGS"]) - myenv.MergeFlags(env["LIBIDN_FLAGS"]) - myenv.MergeFlags(env.get("LIBXML_FLAGS", "")) - myenv.MergeFlags(env.get("EXPAT_FLAGS", "")) - myenv.MergeFlags(env["OPENSSL_FLAGS"]) - myenv.MergeFlags(env["BOOST_FLAGS"]) - myenv.MergeFlags(myenv["PLATFORM_FLAGS"]) + myenv.UseFlags(env["SWIFTEN_FLAGS"]) + myenv.UseFlags(env["LIBIDN_FLAGS"]) + myenv.UseFlags(env.get("LIBXML_FLAGS", "")) + myenv.UseFlags(env.get("EXPAT_FLAGS", "")) + myenv.UseFlags(env["OPENSSL_FLAGS"]) + myenv.UseFlags(env["BOOST_FLAGS"]) + myenv.UseFlags(myenv["PLATFORM_FLAGS"]) myenv.Program("limber", ["main.cpp"]) |