summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiftob/SConscript')
-rw-r--r--Swiftob/SConscript16
1 files changed, 11 insertions, 5 deletions
diff --git a/Swiftob/SConscript b/Swiftob/SConscript
index bb056bb..a830b84 100644
--- a/Swiftob/SConscript
+++ b/Swiftob/SConscript
@@ -1,13 +1,19 @@
Import("env")
+if env["SCONS_STAGE"] == "build" and not GetOption("help") and not env.get("HAVE_LUA", 0) :
+ print "Warning: Lua was not found. Swiftob will not be built."
+ if "Sluift" in env["PROJECTS"] :
+ env["PROJECTS"].remove("Sluift")
-if env["SCONS_STAGE"] == "build":
+elif env["SCONS_STAGE"] == "build":
myenv = env.Clone()
- myenv.MergeFlags(myenv.get("LUA_FLAGS", {}))
- myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
- myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"])
+ # Too many compile warnings here at the moment
+ myenv.Replace(CXXFLAGS = [flag for flag in env["CXXFLAGS"] if flag != "-Weverything"])
+ myenv.UseFlags(myenv.get("LUA_FLAGS", {}))
+ myenv.UseFlags(myenv["SWIFTEN_FLAGS"])
+ myenv.UseFlags(myenv["SWIFTEN_DEP_FLAGS"])
sources = [
- "linit.cpp",
+ "linit.c",
"Swiftob.cpp",
"Users.cpp",
"Commands.cpp",