Swiftdiff options
| -rw-r--r-- | BuildTools/SCons/SConstruct | 4 | ||||
| -rw-r--r-- | Swiftob/SConscript | 2 |
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 @@ -197,28 +197,28 @@ if env["PLATFORM"] != "win32" and env["PLATFORM"] != "darwin" : gconf_env = conf_env.Clone() conf = Configure(gconf_env, custom_tests = {"CheckPKG": CheckPKG}) if conf.CheckPKG("gconf-2.0") : gconf_bare_env = Environment() gconf_bare_env.ParseConfig('pkg-config --cflags gconf-2.0 gobject-2.0 --libs gconf-2.0 gobject-2.0') gconf_flags = { "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") : env["HAVE_GCONF"] = 1 env["GCONF_FLAGS"] = { "LIBS": gconf_env["LIBS"], "CCFLAGS": gconf_env["CCFLAGS"], "CPPPATH": gconf_env["CPPPATH"], - "CPPDEFINES": gconf_env["CPPDEFINES"], + "CPPDEFINES": gconf_env.get("CPPDEFINES", []), } conf.Finish() # Sparkle env["HAVE_SPARKLE"] = 0 if env["PLATFORM"] == "darwin" : sparkle_flags = { "FRAMEWORKPATH": ["/Library/Frameworks"], "FRAMEWORKS": ["Sparkle"] diff --git a/Swiftob/SConscript b/Swiftob/SConscript index 43c4819..bb056bb 100644 --- a/Swiftob/SConscript +++ b/Swiftob/SConscript @@ -1,17 +1,17 @@ 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", "Users.cpp", "Commands.cpp", "MUCs.cpp", "Storage.cpp", "LuaCommands.cpp", "main.cpp" |