From c052b387ec09463c450f530692e258c7f522324b Mon Sep 17 00:00:00 2001 From: Mattes D Date: Mon, 11 Mar 2024 23:16:17 +0100 Subject: Reverted moving Lua to C++. --- lib/lua | 2 +- lib/sqlite | 2 +- src/Bindings/LuaState.cpp | 10 ++++++++-- src/Bindings/LuaState.h | 5 ++++- src/Bindings/LuaWindow.cpp | 5 ++++- src/Bindings/PluginLua.cpp | 5 ++++- 6 files changed, 22 insertions(+), 7 deletions(-) diff --git a/lib/lua b/lib/lua index f543fd793..9972ba6d4 160000 --- a/lib/lua +++ b/lib/lua @@ -1 +1 @@ -Subproject commit f543fd79318bf31c81141a07662eb71896a1d938 +Subproject commit 9972ba6d45f572b3569f907421fbc4866b4d1bfb diff --git a/lib/sqlite b/lib/sqlite index 9aeab26b0..4435d7e42 160000 --- a/lib/sqlite +++ b/lib/sqlite @@ -1 +1 @@ -Subproject commit 9aeab26b00c0bf4c1c3d0afd61acaf08eaf949d3 +Subproject commit 4435d7e4297220228174385302d430f1fdf3d090 diff --git a/src/Bindings/LuaState.cpp b/src/Bindings/LuaState.cpp index 3d65045dd..08d2b8b2e 100644 --- a/src/Bindings/LuaState.cpp +++ b/src/Bindings/LuaState.cpp @@ -6,7 +6,10 @@ #include "Globals.h" #include "LuaState.h" -#include "lua/src/lualib.h" +extern "C" +{ + #include "lua/src/lualib.h" +} #undef TOLUA_TEMPLATE_BIND #include "tolua++/include/tolua++.h" @@ -32,7 +35,10 @@ // fwd: "SQLite/lsqlite3.cpp" -int luaopen_lsqlite3(lua_State * L); +extern "C" +{ + int luaopen_lsqlite3(lua_State * L); +} // fwd: "LuaExpat/lxplib.cpp": int luaopen_lxp(lua_State * L); diff --git a/src/Bindings/LuaState.h b/src/Bindings/LuaState.h index 64e6cbe82..27b2990a6 100644 --- a/src/Bindings/LuaState.h +++ b/src/Bindings/LuaState.h @@ -30,7 +30,10 @@ stays valid but doesn't call into Lua code anymore, returning false for "failure #pragma once -#include "lua/src/lauxlib.h" +extern "C" +{ + #include "lua/src/lauxlib.h" +} #include "../Defines.h" #include "../FunctionRef.h" diff --git a/src/Bindings/LuaWindow.cpp b/src/Bindings/LuaWindow.cpp index eb4187887..073b8c21e 100644 --- a/src/Bindings/LuaWindow.cpp +++ b/src/Bindings/LuaWindow.cpp @@ -7,7 +7,10 @@ #include "../Entities/Player.h" #include "../UI/SlotArea.h" #include "PluginLua.h" -#include "lua/src/lauxlib.h" // Needed for LUA_REFNIL +extern "C" +{ + #include "lua/src/lauxlib.h" // Needed for LUA_REFNIL +} #include "../Root.h" #include "../ClientHandle.h" diff --git a/src/Bindings/PluginLua.cpp b/src/Bindings/PluginLua.cpp index 41e2e14f7..e218fcd06 100644 --- a/src/Bindings/PluginLua.cpp +++ b/src/Bindings/PluginLua.cpp @@ -20,7 +20,10 @@ #include "../Root.h" #include "../WebAdmin.h" -#include "lua/src/lauxlib.h" +extern "C" +{ + #include "lua/src/lauxlib.h" +} #undef TOLUA_TEMPLATE_BIND #include "tolua++/include/tolua++.h" -- cgit v1.2.3