summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThilo Cestonaro <thilo@cestona.ro>2011-08-25 12:47:52 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-08-27 17:35:30 (GMT)
commit6d74e548e9e748007f6541dbcb0ed148e572332e (patch)
treed1873b067d8fafe85fac002493220ed3e86cca94
parent7f931ab66d8294a20267f1008540532828ab0d20 (diff)
downloadswift-contrib-6d74e548e9e748007f6541dbcb0ed148e572332e.zip
swift-contrib-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
-rw-r--r--BuildTools/SCons/SConstruct4
-rw-r--r--Swiftob/SConscript2
2 files changed, 3 insertions, 3 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index cc052ca..88a195a 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -203,7 +203,7 @@ if env["PLATFORM"] != "win32" and env["PLATFORM"] != "darwin" :
"LIBS": gconf_bare_env["LIBS"],
"CCFLAGS": gconf_bare_env["CCFLAGS"],
"CPPPATH": gconf_bare_env["CPPPATH"],
- "CPPDEFINES": gconf_bare_env["CPPDEFINES"],
+ "CPPDEFINES": gconf_bare_env.get("CPPDEFINES", []),
}
gconf_env.MergeFlags(gconf_flags)
if conf.CheckCHeader("gconf/gconf-client.h") and conf.CheckLib("gconf-2") :
@@ -212,7 +212,7 @@ if env["PLATFORM"] != "win32" and env["PLATFORM"] != "darwin" :
"LIBS": gconf_env["LIBS"],
"CCFLAGS": gconf_env["CCFLAGS"],
"CPPPATH": gconf_env["CPPPATH"],
- "CPPDEFINES": gconf_env["CPPDEFINES"],
+ "CPPDEFINES": gconf_env.get("CPPDEFINES", []),
}
conf.Finish()
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",