neocturne/rpgedit
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Lua 5.3

Browse source
This commit is contained in:
Matthias Schiffer 2015-12-09 23:52:21 +01:00
parent c5a98c282b
commit 4135928a9f
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -5,6 +5,6 @@ project(RPGEDIT CXX)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(SDL2 REQUIRED sdl2 SDL2_image) pkg_check_modules(SDL2 REQUIRED sdl2 SDL2_image)
find_package(Lua 5.2 EXACT REQUIRED) find_package(Lua 5.3 EXACT REQUIRED)
add_subdirectory(src) add_subdirectory(src)

8
src/control/ScriptContext.cpp
View file

@ -34,15 +34,17 @@ namespace Control {
void ScriptContext::setupEnv() { void ScriptContext::setupEnv() {
const std::pair<const char *, lua_CFunction> libs[] = { const std::pair<const char *, lua_CFunction> libs[] = {
{"_G", luaopen_base}, {"_G", luaopen_base},
{"bit32", luaopen_bit32},
{"math", luaopen_math}, {"math", luaopen_math},
{"string", luaopen_string}, {"string", luaopen_string},
{"table", luaopen_table}, {"table", luaopen_table},
{"utf8", luaopen_utf8},
}; };
for (auto &lib : libs) { for (auto &lib : libs) {
luaL_requiref(L, lib.first, lib.second, 1); lua_pushcfunction(L, lib.second);
lua_pop(L, 1); lua_pushstring(L, lib.first);
lua_call(L, 1, 1);
lua_setglobal(L, lib.first);
} }
for (const char *f : {"dofile", "loadfile", "require"}) { for (const char *f : {"dofile", "loadfile", "require"}) {