Merge branch 'master' into server

.gitlab-ci.yml

@@ -81,16 +81,22 @@ mat_windows:
   stage: build
   #variables:
   #  NO_LUA_SAFE: '1' # on client no lua safe
-
-exec_windows:
-  extends: ._exec_build
-  tags:
-    - vs
   cache:
     key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
     paths:
       - bin/
       - obj/
+
+exec_windows:
+  extends: ._exec_build
+  tags:
+    - vs
+
+
+exec_windows:
+  extends: ._exec_build
+  tags:
+    - vs
   dependencies:
     - mat_common
     - mat_windows
@@ -108,11 +114,6 @@ exec_linux:
   extends: ._exec_build
   tags:
     - linux
-  cache:
-    key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
-    paths:
-      - bin/
-      - obj/
   dependencies:
     - mat_common
     - mat_linux
@@ -133,11 +134,6 @@ exec_debian:
   extends: ._exec_build
   tags:
     - linux
-  cache:
-    key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
-    paths:
-      - bin/
-      - obj/
   dependencies:
     - mat_common
     - mat_linux

premake5.lua

@@ -201,7 +201,10 @@ if GetParam("winxp-support") and os.istarget("windows") then
     WINXP_SUPPORT = true
 end
 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"
 end
 if GetParam("server-mode") then