Merge branch 'master' into server

.ci/exec-macos-platform.sh

@@ -2,13 +2,16 @@
 set -x
 set -o errexit
 
+TARGET_PLATFORM=$(arch)
 TARGET_YGOPRO_BINARY_PATH=./ygopro-platforms/ygopro-platform-$TARGET_PLATFORM
 export EVENT_INCLUDE_DIR=$PWD/libevent-stable/include
 export EVENT_LIB_DIR=$PWD/libevent-stable/lib
 export IRRLICHT_INCLUDE_DIR=$PWD/irrlicht/include
 export IRRLICHT_LIB_DIR=$PWD/irrlicht
 
-./premake5 gmake --cc=clang --build-freetype --build-sqlite
+./.ci/libevent-prebuild.sh
+
+./premake5 gmake --cc=clang --build-freetype --build-sqlite --no-use-irrklang
 
 cd build
 make config=release -j4

premake5.lua

@@ -200,8 +200,9 @@ BUILD_IKPMP3 = USE_IRRKLANG
 if GetParam("winxp-support") and os.istarget("windows") then
     WINXP_SUPPORT = true
 end
-if GetParam("mac-arm") and os.istarget("macosx") then
+if os.istarget("macosx") then
     MAC_ARM = true
+    ON_MAC_ARM = MAC_ARM or io.popen('arch'):read('*l') == "arm64"
 end
 if GetParam("server-mode") then
     SERVER_MODE = true
@@ -274,7 +275,7 @@ end
     filter { "configurations:Release", "not action:vs*" }
         symbols "On"
         defines "NDEBUG"
-        if not MAC_ARM then
+        if not ON_MAC_ARM then
             buildoptions "-march=native"
         end