Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-03-15 19:30:36 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-03-15 19:30:36 (GMT) |
| commit | 04e3aae0a3602212d1858c19a89a72eb24760eab (patch) | |
| tree | 02f3175ca8431480ea2d75eeb4b1e8970df95b07 | |
| parent | 437907cb26802b4be0c8e1ae9f4d54113b8d855b (diff) | |
| download | swift-04e3aae0a3602212d1858c19a89a72eb24760eab.zip swift-04e3aae0a3602212d1858c19a89a72eb24760eab.tar.bz2 | |
Don't fail if LUA_FLAGS aren't set.
| -rw-r--r-- | Sluift/SConscript | 2 | ||||
| -rw-r--r-- | Swiftob/SConscript | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Sluift/SConscript b/Sluift/SConscript index 777cf0c..19255f1 100644 --- a/Sluift/SConscript +++ b/Sluift/SConscript @@ -14,7 +14,7 @@ if env["SCONS_STAGE"] == "build" : myenv = env.Clone() myenv.Append(LIBS = sluift_lib) - myenv.UseFlags(env["LUA_FLAGS"]) + myenv.UseFlags(env.get("LUA_FLAGS", {})) myenv.UseFlags(env["SWIFTEN_FLAGS"]) myenv.UseFlags(env["SWIFTEN_DEP_FLAGS"]) myenv["SHLIBPREFIX"] = "" diff --git a/Swiftob/SConscript b/Swiftob/SConscript index 2139822..3928ff0 100644 --- a/Swiftob/SConscript +++ b/Swiftob/SConscript @@ -12,7 +12,7 @@ if env["SCONS_STAGE"] == "build": myenv.MergeFlags(myenv.get("LIBXML_FLAGS", "")) myenv.MergeFlags(myenv.get("EXPAT_FLAGS", "")) myenv.MergeFlags(myenv["PLATFORM_FLAGS"]) - myenv.MergeFlags(myenv["LUA_FLAGS"]) + myenv.MergeFlags(myenv.get("LUA_FLAGS", {})) sources = [ "linit.c", # This is horrible! "Swiftob.cpp", @@ -23,4 +23,4 @@ if env["SCONS_STAGE"] == "build": "LuaCommands.cpp", "main.cpp" ] - swiftob = myenv.Program("swiftob", sources)
\ No newline at end of file + swiftob = myenv.Program("swiftob", sources) |