Skip to content

Y
ygopro
Commit 5d3a9d7c authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents 544ad64c 73fdec2d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
.gitlab-ci.yml
View file @ 5d3a9d7c
...@@ -72,6 +72,7 @@ exec_windows: ...@@ -72,6 +72,7 @@ exec_windows:
#variables: #variables:
# irrklang_pro: '1' # irrklang_pro: '1'
cache: cache:
key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
paths: paths:
- bin/ - bin/
- obj/ - obj/
...@@ -98,6 +99,7 @@ exec_linux: ...@@ -98,6 +99,7 @@ exec_linux:
#- mat_irrklang #- mat_irrklang
- mat_linux - mat_linux
cache: cache:
key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
paths: paths:
- bin/ - bin/
- obj/ - obj/
......
gframe/premake4.lua
View file @ 5d3a9d7c
...@@ -54,4 +54,5 @@ project "ygopro" ...@@ -54,4 +54,5 @@ project "ygopro"
configuration "macosx" configuration "macosx"
if MAC_ARM then if MAC_ARM then
buildoptions { "--target=arm64-apple-macos11" } buildoptions { "--target=arm64-apple-macos11" }
linkoptions { "-arch arm64" }
end end
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