Commit 3b983c88 authored by nanahira's avatar nanahira

Merge branch 'master' into server

parents 0441bf70 e18a7c56
Pipeline #15246 canceled with stages
in 2 minutes and 10 seconds
...@@ -81,16 +81,22 @@ mat_windows: ...@@ -81,16 +81,22 @@ mat_windows:
stage: build stage: build
#variables: #variables:
# NO_LUA_SAFE: '1' # on client no lua safe # NO_LUA_SAFE: '1' # on client no lua safe
exec_windows:
extends: ._exec_build
tags:
- vs
cache: cache:
key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
paths: paths:
- bin/ - bin/
- obj/ - obj/
exec_windows:
extends: ._exec_build
tags:
- vs
exec_windows:
extends: ._exec_build
tags:
- vs
dependencies: dependencies:
- mat_common - mat_common
- mat_windows - mat_windows
...@@ -108,11 +114,6 @@ exec_linux: ...@@ -108,11 +114,6 @@ exec_linux:
extends: ._exec_build extends: ._exec_build
tags: tags:
- linux - linux
cache:
key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
paths:
- bin/
- obj/
dependencies: dependencies:
- mat_common - mat_common
- mat_linux - mat_linux
...@@ -133,11 +134,6 @@ exec_debian: ...@@ -133,11 +134,6 @@ exec_debian:
extends: ._exec_build extends: ._exec_build
tags: tags:
- linux - linux
cache:
key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
paths:
- bin/
- obj/
dependencies: dependencies:
- mat_common - mat_common
- mat_linux - mat_linux
......
...@@ -201,7 +201,10 @@ if GetParam("winxp-support") and os.istarget("windows") then ...@@ -201,7 +201,10 @@ if GetParam("winxp-support") and os.istarget("windows") then
WINXP_SUPPORT = true WINXP_SUPPORT = true
end end
if os.istarget("macosx") then if os.istarget("macosx") then
MAC_ARM = true MAC_ARM = false
if GetParam("mac-arm") then
MAC_ARM = true
end
ON_MAC_ARM = MAC_ARM or io.popen('arch'):read('*l') == "arm64" ON_MAC_ARM = MAC_ARM or io.popen('arch'):read('*l') == "arm64"
end end
if GetParam("server-mode") then if GetParam("server-mode") 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