Merge branch 'master' into server

premake5.lua

@@ -205,7 +205,6 @@ if os.istarget("macosx") then
     if GetParam("mac-arm") then
         MAC_ARM = true
     end
-    ON_MAC_ARM = MAC_ARM or os.outputof("arch") == "arm64"
 end
 if GetParam("server-mode") then
     SERVER_MODE = true
@@ -278,7 +277,7 @@ end
     filter { "configurations:Release", "not action:vs*" }
         symbols "On"
         defines "NDEBUG"
-        if not ON_MAC_ARM then
+        if not MAC_ARM then
             buildoptions "-march=native"
         end