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 /Swiftob | |
| parent | 2b7f55a30b07f08d32bccd3ea0a72ffd8c820c20 (diff) | |
| download | swift-d6bb5d79e3726d2aad82b52fe637030177b4950f.zip swift-d6bb5d79e3726d2aad82b52fe637030177b4950f.tar.bz2 | |
Replace MergeFlags calls by UseFlags calls.
Change-Id: If7193006987fd86d102e5e17aac426ef1a6ccd83
Diffstat (limited to 'Swiftob')
| -rw-r--r-- | Swiftob/SConscript | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Swiftob/SConscript b/Swiftob/SConscript index bb056bb..b53057c 100644 --- a/Swiftob/SConscript +++ b/Swiftob/SConscript @@ -3,9 +3,9 @@ Import("env") if env["SCONS_STAGE"] == "build": myenv = env.Clone() - myenv.MergeFlags(myenv.get("LUA_FLAGS", {})) - myenv.MergeFlags(myenv["SWIFTEN_FLAGS"]) - myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"]) + myenv.UseFlags(myenv.get("LUA_FLAGS", {})) + myenv.UseFlags(myenv["SWIFTEN_FLAGS"]) + myenv.UseFlags(myenv["SWIFTEN_DEP_FLAGS"]) sources = [ "linit.cpp", "Swiftob.cpp", |