Merge branch 'master' into server

.gitlab-ci.yml

@@ -72,6 +72,7 @@ exec_windows:
   #variables:
   #  irrklang_pro: '1'
   cache:
+    key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
     paths:
       - bin/
       - obj/
@@ -98,6 +99,7 @@ exec_linux:
     #- mat_irrklang
     - mat_linux
   cache:
+    key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
     paths:
       - bin/
       - obj/

gframe/premake4.lua

@@ -54,4 +54,5 @@ project "ygopro"
     configuration "macosx"
         if MAC_ARM then
             buildoptions { "--target=arm64-apple-macos11" }
+            linkoptions { "-arch arm64" }
         end