Skip to content

Commit 2b2485d

Browse files
committed
update to lua5.4.6
1 parent 602402f commit 2b2485d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+17909
-2922
lines changed

CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
cmake_minimum_required(VERSION 3.11)
22

33
project (emmy)
4-
set(CMAKE_INSTALL_PREFIX install)
4+
5+
if (NOT CMAKE_INSTALL_PREFIX)
6+
set(CMAKE_INSTALL_PREFIX install)
7+
endif()
58

69
set(CMAKE_CXX_STANDARD 11)
710

811
set(EMMY_LUA_VERSION "54" CACHE STRING "Lua version: jit/51/52/53/54")
912
set(EMMY_CORE_VERSION "DEV" CACHE STRING "Emmy core version: DEV/version number")
13+
option(EMMY_USE_LUA_SOURCE "Build with lua source" OFF)
1014

1115
if(${EMMY_LUA_VERSION} STREQUAL "54")
12-
set(EMMY_LUA_DIR "lua-5.4.0")
16+
set(EMMY_LUA_DIR "lua-5.4.6")
1317
add_definitions(-DEMMY_LUA_54)
1418
elseif(${EMMY_LUA_VERSION} STREQUAL "53")
1519
set(EMMY_LUA_DIR "lua-5.3.5")

emmy_core/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ add_dependencies(
99
emmy_debugger
1010
)
1111

12-
option(EMMY_USE_LUA_SOURCE "Build with lua source" OFF)
13-
1412
set_target_properties(emmy_core PROPERTIES PREFIX "")
1513

1614
target_include_directories(emmy_core

emmy_debugger/src/api/lua_state/lua_state_54.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#ifdef EMMY_USE_LUA_SOURCE
33
#include "lstate.h"
44
#else
5-
#include "lua-5.4.0/src/lstate.h"
5+
#include "lua-5.4.6/src/lstate.h"
66
#endif
77

88
lua_State* GetMainState_lua54(lua_State* L)

0 commit comments

Comments
 (0)