diff --git a/deploy.ps1 b/deploy.ps1 index 9f7577b..f98f109 100644 --- a/deploy.ps1 +++ b/deploy.ps1 @@ -11,7 +11,6 @@ $targets = @( "Qt5Widgets.dll", "LoaderDll.dll", "LocaleEmulator.dll", - "lua53.dll", "Bing Translate.dll", "Copy to Clipboard.dll", "Extra Newlines.dll", diff --git a/extensions/lua.cpp b/extensions/lua.cpp index 14e6049..a59432b 100644 --- a/extensions/lua.cpp +++ b/extensions/lua.cpp @@ -8,52 +8,27 @@ #include #include -extern "C" +extern "C" // Lua library { - enum LuaType - { - LUA_TNONE = -1, - LUA_TNIL = 0, - LUA_TBOOLEAN = 1, - LUA_TLIGHTUSERDATA = 2, - LUA_TNUMBER = 3, - LUA_TSTRING = 4, - LUA_TTABLE = 5, - LUA_TFUNCTION = 6, - LUA_TUSERDATA = 7, - LUA_TTHREAD = 8 - }; + enum LuaType { LUA_TNIL, LUA_TBOOLEAN, LUA_TLIGHTUSERDATA, LUA_TNUMBER, LUA_TSTRING, LUA_TTABLE, LUA_TFUNCTION, LUA_TUSERDATA, LUA_TTHREAD }; - enum LuaStatus - { - LUA_OK = 0, - LUA_YIELD = 1, - LUA_ERRRUN = 2, - LUA_ERRSYNTAX = 3, - LUA_ERRMEM = 4, - LUA_ERRGCMM = 5, - LUA_ERRERR = 6 - }; + enum LuaStatus { LUA_OK, LUA_YIELD, LUA_ERRRUN, LUA_ERRSYNTAX, LUA_ERRMEM, LUA_ERRGCMM, LUA_ERRERR }; struct lua_State; - __declspec(dllimport) lua_State* luaL_newstate(); - __declspec(dllimport) void luaL_openlibs(lua_State*); - __declspec(dllimport) void lua_close(lua_State*); + lua_State* luaL_newstate(); + void luaL_openlibs(lua_State*); + void lua_close(lua_State*); + LuaStatus luaL_loadstring(lua_State*, const char* str); - __declspec(dllimport) LuaStatus luaL_loadstring(lua_State*, const char* str); + const char* lua_tolstring(lua_State*, int index, size_t* size); + const char* lua_pushstring(lua_State*, const char* str); + void lua_pushinteger(lua_State*, int64_t n); + void lua_createtable(lua_State*, int narr, int nrec); + void lua_settable(lua_State*, int index); - __declspec(dllimport) LuaStatus lua_pcallk(lua_State*, int nargs, int nresults, int msgh, void*, void*); - - __declspec(dllimport) const char* lua_tolstring(lua_State*, int index, size_t* size); - __declspec(dllimport) const char* lua_pushstring(lua_State*, const char* str); - - __declspec(dllimport) void lua_pushinteger(lua_State*, int64_t n); - - __declspec(dllimport) void lua_createtable(lua_State*, int narr, int nrec); - __declspec(dllimport) void lua_settable(lua_State*, int index); - - __declspec(dllimport) void lua_settop(lua_State*, int index); - __declspec(dllimport) LuaType lua_getglobal(lua_State*, const char* name); + void lua_settop(lua_State*, int index); + LuaType lua_getglobal(lua_State*, const char* name); + LuaStatus lua_pcallk(lua_State*, int nargs, int nresults, int msgh, void*, void*); } bool luaL_dostring(lua_State* L, const char* str) diff --git a/x64libs/lua53.dll b/x64libs/lua53.dll deleted file mode 100644 index a0d8de2..0000000 Binary files a/x64libs/lua53.dll and /dev/null differ diff --git a/x64libs/lua53.lib b/x64libs/lua53.lib index 9f2a77e..bafa423 100644 Binary files a/x64libs/lua53.lib and b/x64libs/lua53.lib differ diff --git a/x86libs/lua53.dll b/x86libs/lua53.dll deleted file mode 100644 index 7d65811..0000000 Binary files a/x86libs/lua53.dll and /dev/null differ diff --git a/x86libs/lua53.lib b/x86libs/lua53.lib index 508951f..3ba534f 100644 Binary files a/x86libs/lua53.lib and b/x86libs/lua53.lib differ