diff options
Diffstat (limited to '3rdParty/Lua/SConscript')
-rw-r--r-- | 3rdParty/Lua/SConscript | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/3rdParty/Lua/SConscript b/3rdParty/Lua/SConscript index 68f4e36..f73286f 100644 --- a/3rdParty/Lua/SConscript +++ b/3rdParty/Lua/SConscript @@ -7,6 +7,7 @@ if env.get("LUA_BUNDLED", False) : ################################################################################ if env["SCONS_STAGE"] == "flags" : + env["HAVE_LUA"] = True cppdefines = [] if not env["optimize"] : cppdefines.append("LUA_USE_APICHECK") @@ -30,13 +31,12 @@ if env.get("LUA_BUNDLED", False) : if env["SCONS_STAGE"] == "build" : myenv = env.Clone() - if env["PLATFORM"] == "win32" : - myenv.Append(CFLAGS = ["/TP"]) - else : - myenv.Append(CFLAGS = ["-x", "c++"]) # Remove warn flags - myenv.Replace(CCFLAGS = [flag for flag in env["CCFLAGS"] if flag not in ["-W", "-Wall"]]) + myenv.Replace(CCFLAGS = [flag for flag in env["CCFLAGS"] if not flag.startswith("-W")]) + if "clang" in env["CC"] : + myenv.Append(CCFLAGS = ["-Wno-unknown-warning-option", "-Wno-empty-body"]) + myenv.MergeFlags(myenv["LUA_FLAGS"]) myenv.StaticLibrary("Swiften_Lua", [ "src/lapi.c", |