Merge branch 'server' into full-view

.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

.gitlab-ci.yml

@@ -87,6 +87,12 @@ mat_windows:
       - bin/
       - obj/
 
+exec_windows:
+  extends: ._exec_build
+  tags:
+    - vs
+
+
 exec_windows:
   extends: ._exec_build
   tags:

premake5.lua

@@ -200,8 +200,11 @@ 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
-    MAC_ARM = true
+if os.istarget("macosx") then
+    MAC_ARM = false
+    if GetParam("mac-arm") then
+        MAC_ARM = true
+    end
 end
 if GetParam("server-mode") then
     SERVER_MODE = true
@@ -218,7 +221,7 @@ end
 workspace "YGOPro"
     location "build"
     language "C++"
-    objdir "obj"
+    objdir "obj"    
 
     configurations { "Release", "Debug" }
 

script @ 329c08f1

-Subproject commit edea1bcb385ed0fe6496b26247e171196e9e079a
+Subproject commit 329c08f1a55c2f08a08f9397a246c52426887f12