Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-12-09 16:21:40 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-12-22 14:25:39 (GMT) |
| commit | d6bb5d79e3726d2aad82b52fe637030177b4950f (patch) | |
| tree | b2f4c74a1592825582f82d88d74ae3b85b42665b /Swiften/Config/SConscript | |
| parent | 2b7f55a30b07f08d32bccd3ea0a72ffd8c820c20 (diff) | |
| download | swift-d6bb5d79e3726d2aad82b52fe637030177b4950f.zip swift-d6bb5d79e3726d2aad82b52fe637030177b4950f.tar.bz2 | |
Replace MergeFlags calls by UseFlags calls.
Change-Id: If7193006987fd86d102e5e17aac426ef1a6ccd83
Diffstat (limited to 'Swiften/Config/SConscript')
| -rw-r--r-- | Swiften/Config/SConscript | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/Config/SConscript b/Swiften/Config/SConscript index 357a5e6..f964993 100644 --- a/Swiften/Config/SConscript +++ b/Swiften/Config/SConscript @@ -17,8 +17,8 @@ def cStringVariable(env, cVar, sconsVar) : config_flags = "" swiften_env = env.Clone() -swiften_env.MergeFlags(swiften_env["SWIFTEN_FLAGS"]) -swiften_env.MergeFlags(swiften_env["SWIFTEN_DEP_FLAGS"]) +swiften_env.UseFlags(swiften_env["SWIFTEN_FLAGS"]) +swiften_env.UseFlags(swiften_env["SWIFTEN_DEP_FLAGS"]) cppflags = replaceSwiftenPath(" ".join([swiften_env.subst("$_CPPDEFFLAGS"), swiften_env.subst("$_CPPINCFLAGS")])) config_flags += cStringVariable(swiften_env, "CPPFLAGS", cppflags) @@ -29,8 +29,8 @@ config_flags += cStringVariable(swiften_env, "LIBFLAGS", libflags) config_env = env.Clone() # Create a local copy of Paths.cpp to avoid a Swiften dependency config_env.Install(".", "#/Swiften/Base/Paths.cpp") -config_env.MergeFlags(config_env["BOOST_FLAGS"]) -config_env.MergeFlags(config_env["PLATFORM_FLAGS"]) +config_env.UseFlags(config_env["BOOST_FLAGS"]) +config_env.UseFlags(config_env["PLATFORM_FLAGS"]) config_env.WriteVal("swiften-config.h", config_env.Value(config_flags)) swiften_config = config_env.Program("swiften-config", [ "Paths.cpp", |