Commit 724bf668 authored by nanahira's avatar nanahira

support lua5.4

parent 84eddec4
...@@ -179,7 +179,7 @@ exec_windows_pro3: ...@@ -179,7 +179,7 @@ exec_windows_pro3:
LUA_DEB: '1' LUA_DEB: '1'
RELEASE_DIR: debian-x64 RELEASE_DIR: debian-x64
before_script: before_script:
- apt update; apt -y install git build-essential liblua5.3-dev libsqlite3-dev libevent-dev - apt update; apt -y install git build-essential liblua5.4-dev libsqlite3-dev libevent-dev
.use_arm: .use_arm:
image: git-registry.moenext.com/mycard/docker-ygopro-builder:fpic image: git-registry.moenext.com/mycard/docker-ygopro-builder:fpic
......
...@@ -156,9 +156,22 @@ end ...@@ -156,9 +156,22 @@ end
if GetParam("lua-deb") then if GetParam("lua-deb") then
BUILD_LUA = false BUILD_LUA = false
LUA_LIB_DIR = "/usr/lib/x86_64-linux-gnu" local lua_versions = { "5.4", "5.3" }
LUA_LIB_NAME = "lua5.3-c++" local lua_version = nil
LUA_INCLUDE_DIR = "/usr/include/lua5.3" for _, version in ipairs(lua_versions) do
local lua_lib_dir = os.findlib("lua" .. version)
if lua_lib_dir then
print("Found lua " .. version .. " at " .. lua_lib_dir)
lua_version = version
LUA_LIB_DIR = lua_lib_dir
break
end
end
if not lua_version then
error("Lua library not found. Please install lua by command 'sudo apt -y install liblua5.4-dev'")
end
LUA_LIB_NAME = "lua" .. lua_version .. "-c++"
LUA_INCLUDE_DIR = path.join("/usr/include", "lua" .. lua_version)
end end
if GetParam("build-event") then if GetParam("build-event") then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment