Swiftdiff options
Diffstat (limited to '3rdParty/Lua')
| -rw-r--r-- | 3rdParty/Lua/01_disable_dl.diff | 15 | ||||
| -rw-r--r-- | 3rdParty/Lua/SConscript | 10 | ||||
| -rw-r--r-- | 3rdParty/Lua/src/lua.hpp | 5 | ||||
| -rw-r--r-- | 3rdParty/Lua/src/luaconf.h | 4 |
4 files changed, 28 insertions, 6 deletions
diff --git a/3rdParty/Lua/01_disable_dl.diff b/3rdParty/Lua/01_disable_dl.diff new file mode 100644 index 0000000..3324a78 --- /dev/null +++ b/3rdParty/Lua/01_disable_dl.diff @@ -0,0 +1,15 @@ +diff --git a/3rdParty/Lua/src/luaconf.h b/3rdParty/Lua/src/luaconf.h +index e2cb261..ee37a9f 100644 +--- a/3rdParty/Lua/src/luaconf.h ++++ b/3rdParty/Lua/src/luaconf.h +@@ -757,7 +757,9 @@ union luai_Cast { double l_d; long l_l; }; + ** without modifying the main part of the file. + */ + +- ++#undef LUA_DL_DYLD ++#undef LUA_DL_DLOPEN ++#undef LUA_DL_DLL + + #endif + 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", diff --git a/3rdParty/Lua/src/lua.hpp b/3rdParty/Lua/src/lua.hpp new file mode 100644 index 0000000..5060a4e --- /dev/null +++ b/3rdParty/Lua/src/lua.hpp @@ -0,0 +1,5 @@ +extern "C" { +#include "lua.h" +#include "lualib.h" +#include "lauxlib.h" +} diff --git a/3rdParty/Lua/src/luaconf.h b/3rdParty/Lua/src/luaconf.h index e2cb261..ee37a9f 100644 --- a/3rdParty/Lua/src/luaconf.h +++ b/3rdParty/Lua/src/luaconf.h @@ -757,7 +757,9 @@ union luai_Cast { double l_d; long l_l; }; ** without modifying the main part of the file. */ - +#undef LUA_DL_DYLD +#undef LUA_DL_DLOPEN +#undef LUA_DL_DLL #endif |