diff --git a/Aquaria/ScriptInterface.cpp b/Aquaria/ScriptInterface.cpp index 45cdebc..d56835a 100644 --- a/Aquaria/ScriptInterface.cpp +++ b/Aquaria/ScriptInterface.cpp @@ -10682,6 +10682,8 @@ lua_State *ScriptInterface::createLuaVM() lua_setglobal(state, "os"); lua_pushnil(state); lua_setglobal(state, "io"); + lua_pushnil(state); + lua_setglobal(state, "package"); } // Set up various tables for state management: diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e1863c..5a586bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -180,7 +180,7 @@ if(NOT SDL_FOUND) else(AQUARIA_USE_SDL2) set(SDLDIR "${EXTLIBDIR}/SDL12") endif(AQUARIA_USE_SDL2) - + if(MACOSX) set(SDL_INCLUDE_DIR "${SDLDIR}/include") message(STATUS "Using internal copy of SDL") @@ -333,7 +333,7 @@ IF(CMAKE_COMPILER_IS_GNUCC) IF(AQUARIA_GCC_HAS_STACKPROT) ADD_DEFINITIONS(-fno-stack-protector) ENDIF(AQUARIA_GCC_HAS_STACKPROT) - + # -O3 breaks on some GCC/MinGW versions, make sure CMake does not set this as default. # Exceptions are not used, excluding support for release builds adds less bulk as well. set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG" CACHE STRING "Flags used for release builds" FORCE) @@ -661,9 +661,13 @@ SET(LUA_SRCS ${LUASRCDIR}/ldump.c ${LUASRCDIR}/lfunc.c ${LUASRCDIR}/lgc.c + ${LUASRCDIR}/linit.c + ${LUASRCDIR}/liolib.c ${LUASRCDIR}/lmem.c + ${LUASRCDIR}/loadlib.c ${LUASRCDIR}/lobject.c ${LUASRCDIR}/lopcodes.c + ${LUASRCDIR}/loslib.c ${LUASRCDIR}/lstate.c ${LUASRCDIR}/lstring.c ${LUASRCDIR}/ltable.c