diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2015-12-09 23:52:21 +0100 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2015-12-10 00:42:02 +0100 |
| commit | 4135928a9f74bf431b6cbca4ad47f00fa47aea56 (patch) | |
| tree | 44d0536118212734f0c6e723745fd406739669d7 | |
| parent | c5a98c282b86d97330352fe17a7b6998b38237e5 (diff) | |
| download | rpgedit-old/sdl.tar rpgedit-old/sdl.zip | |
Update to Lua 5.3old/sdl
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/control/ScriptContext.cpp | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0cdd80d..25165ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,6 @@ project(RPGEDIT CXX) find_package(PkgConfig REQUIRED) 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) diff --git a/src/control/ScriptContext.cpp b/src/control/ScriptContext.cpp index b92c8e5..e92e275 100644 --- a/src/control/ScriptContext.cpp +++ b/src/control/ScriptContext.cpp @@ -34,15 +34,17 @@ namespace Control { void ScriptContext::setupEnv() { const std::pair<const char *, lua_CFunction> libs[] = { {"_G", luaopen_base}, - {"bit32", luaopen_bit32}, {"math", luaopen_math}, {"string", luaopen_string}, {"table", luaopen_table}, + {"utf8", luaopen_utf8}, }; for (auto &lib : libs) { - luaL_requiref(L, lib.first, lib.second, 1); - lua_pop(L, 1); + lua_pushcfunction(L, lib.second); + lua_pushstring(L, lib.first); + lua_call(L, 1, 1); + lua_setglobal(L, lib.first); } for (const char *f : {"dofile", "loadfile", "require"}) { |