update to lua5.4.6

EmmyLua · Aug 25, 2023 · 2b2485d · 2b2485d
1 parent 602402f
commit 2b2485d
Show file tree

Hide file tree

Showing 81 changed files with 17,909 additions and 2,922 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,15 +1,19 @@
 cmake_minimum_required(VERSION 3.11)
 
 project (emmy)
-set(CMAKE_INSTALL_PREFIX install)
+
+if (NOT CMAKE_INSTALL_PREFIX)
+    set(CMAKE_INSTALL_PREFIX install)
+endif()
 
 set(CMAKE_CXX_STANDARD 11)
 
 set(EMMY_LUA_VERSION "54" CACHE STRING "Lua version: jit/51/52/53/54")
 set(EMMY_CORE_VERSION "DEV" CACHE STRING "Emmy core version: DEV/version number")
+option(EMMY_USE_LUA_SOURCE "Build with lua source" OFF)
 
 if(${EMMY_LUA_VERSION} STREQUAL "54")
-    set(EMMY_LUA_DIR "lua-5.4.0")
+    set(EMMY_LUA_DIR "lua-5.4.6")
     add_definitions(-DEMMY_LUA_54)
 elseif(${EMMY_LUA_VERSION} STREQUAL "53")
     set(EMMY_LUA_DIR "lua-5.3.5")

diff --git a/emmy_core/CMakeLists.txt b/emmy_core/CMakeLists.txt
@@ -9,8 +9,6 @@ add_dependencies(
     emmy_debugger
 )
 
-option(EMMY_USE_LUA_SOURCE "Build with lua source" OFF)
-
 set_target_properties(emmy_core PROPERTIES PREFIX "")
 
 target_include_directories(emmy_core

diff --git a/emmy_debugger/src/api/lua_state/lua_state_54.cpp b/emmy_debugger/src/api/lua_state/lua_state_54.cpp
@@ -2,7 +2,7 @@
 #ifdef EMMY_USE_LUA_SOURCE
 #include "lstate.h"
 #else
-#include "lua-5.4.0/src/lstate.h"
+#include "lua-5.4.6/src/lstate.h"
 #endif
 
 lua_State* GetMainState_lua54(lua_State* L)