Commit 8e7ea6a9 authored by nanahira's avatar nanahira

fix

parent b58eac20
Pipeline #36851 passed with stages
in 2 minutes and 13 seconds
...@@ -124,15 +124,6 @@ exec_windows: ...@@ -124,15 +124,6 @@ exec_windows:
- mkdir dist\windows - mkdir dist\windows
- copy bin\release\x64\ygopro.exe dist\windows\ygopro.exe - copy bin\release\x64\ygopro.exe dist\windows\ygopro.exe
exec_windows_pro3:
extends: .exec_windows
script:
- '.\premake5.exe vs2019 --server-pro3-support --log-in-chat'
- cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\msbuild.exe" build\YGOPro.sln /m /p:Configuration=Release /p:Platform=x64'
- mkdir dist
- mkdir dist\windows
- copy bin\release\x64\ygoserver.dll dist\windows\ygoserver.dll
.exec_unix_common: .exec_unix_common:
extends: ._exec_build extends: ._exec_build
variables: variables:
......
...@@ -157,9 +157,22 @@ end ...@@ -157,9 +157,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 .. "-c++")
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