Swiftdiff options
| author | Thilo Cestonaro <thilo@cestona.ro> | 2011-08-25 12:47:52 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-08-27 17:35:30 (GMT) |
| commit | 6d74e548e9e748007f6541dbcb0ed148e572332e (patch) | |
| tree | d1873b067d8fafe85fac002493220ed3e86cca94 /Swiftob | |
| parent | 7f931ab66d8294a20267f1008540532828ab0d20 (diff) | |
| download | swift-6d74e548e9e748007f6541dbcb0ed148e572332e.zip swift-6d74e548e9e748007f6541dbcb0ed148e572332e.tar.bz2 | |
fix compilation on ubuntu 11.10 (e.g. for gcc 4.6)
License: This patch is BSD-licensed, see http://www.opensource.org/licenses/bsd-license.php
Diffstat (limited to 'Swiftob')
| -rw-r--r-- | Swiftob/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swiftob/SConscript b/Swiftob/SConscript index 43c4819..bb056bb 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.MergeFlags(myenv.get("LUA_FLAGS", {})) sources = [ "linit.cpp", "Swiftob.cpp", |