Merge branch 'develop' into server-develop

.ci/exec-macos-platform.sh

@@ -14,7 +14,7 @@ export IRRLICHT_LIB_DIR=$PWD/irrlicht/lib/$(arch)
 ./premake5 gmake --cc=clang --build-freetype --build-sqlite
 
 cd build
-make config=release -j4
+make config=release -j$(nproc)
 cd ..
 
 mkdir ygopro-platforms

.ci/libevent-prebuild.sh

-#!/bin/bash
+#!/bin/sh
 set -x
 set -o errexit
 # PROCESSOR_COUNT=4
 
-wget -O - https://cdn01.moecube.com/ygopro-build-materials/libevent-2.0.22-stable.tar.gz | tar zfx -
+if [ -d "libevent-stable" ]; then
+  rm -rf libevent-stable
+fi
+
+if [ ! -d "libevent-2.0.22-stable" ]; then
+  wget -O - https://cdn01.moecube.com/ygopro-build-materials/libevent-2.0.22-stable.tar.gz | tar zfx -
+fi
+
+install_path="$PWD/libevent-stable"
+
 cd libevent-2.0.22-stable
-./configure --prefix=$PWD/libevent-stable --disable-openssl --enable-static=yes --enable-shared=no "$@"
+./configure "--prefix=$install_path" --disable-openssl --enable-static=yes --enable-shared=no "$@"
 make -j$(nproc)
 make install
 cd ..
-mv libevent-2.0.22-stable/libevent-stable .
-rm -rf libevent-2.0.22-stable

.ci/pack-linux-dlc.sh

@@ -4,7 +4,9 @@ set -o errexit
 
 ARCHIVE_FILES=(ygopro cards.cdb locales fonts sound textures strings.conf system.conf pack)
 
-TARGET_PLATFORM=linux
+if [[ -z "$TARGET_PLATFORM" ]]; then
+    TARGET_PLATFORM=linux
+fi
 
 apt update && apt -y install tar zstd
 mkdir dist replay

.ci/pack-linux.sh

@@ -6,7 +6,9 @@ ARCHIVE_FILES=(ygopro LICENSE README.md lflist.conf strings.conf system.conf car
 
 # TARGET_LOCALE
 # ARCHIVE_SUFFIX
-TARGET_PLATFORM=linux
+if [[ -z "$TARGET_PLATFORM" ]]; then
+    TARGET_PLATFORM=linux
+fi
 
 apt update && apt -y install tar git zstd
 mkdir dist replay

.ci/pack-macos-dlc.sh

@@ -4,7 +4,9 @@ set -o errexit
 
 ARCHIVE_FILES=(ygopro.app cards.cdb locales fonts sound textures strings.conf system.conf pack)
 
-TARGET_PLATFORM=darwin
+if [[ -z "$TARGET_PLATFORM" ]]; then
+    TARGET_PLATFORM=darwin
+fi
 
 apt update && apt -y install tar zstd
 mkdir dist replay

.ci/pack-macos.sh

@@ -6,7 +6,9 @@ ARCHIVE_FILES=(ygopro.app LICENSE README.md lflist.conf strings.conf system.conf
 
 # TARGET_LOCALE
 # ARCHIVE_SUFFIX
-TARGET_PLATFORM=darwin
+if [[ -z "$TARGET_PLATFORM" ]]; then
+    TARGET_PLATFORM=darwin
+fi
 
 apt update && apt -y install tar git zstd
 mkdir dist replay

.ci/pack-windows-7z.sh

@@ -9,7 +9,9 @@ if [[ "$TARGET_LOCALE" == "zh-CN" ]]; then
 fi
 
 # TARGET_LOCALE
-TARGET_PLATFORM=win32
+if [[ -z "$TARGET_PLATFORM" ]]; then
+    TARGET_PLATFORM=win32
+fi
 
 apt update && apt -y install p7zip-full git
 mkdir dist replay

.ci/pack-windows-dlc.sh

@@ -4,7 +4,9 @@ set -o errexit
 
 ARCHIVE_FILES=(ygopro.exe cards.cdb locales fonts sound textures strings.conf system.conf skin pack)
 
-TARGET_PLATFORM=win32
+if [[ -z "$TARGET_PLATFORM" ]]; then
+    TARGET_PLATFORM=win32
+fi
 
 apt update && apt -y install tar zstd
 mkdir dist replay

.ci/pack-windows.sh

@@ -10,7 +10,9 @@ fi
 
 # TARGET_LOCALE
 # ARCHIVE_SUFFIX
-TARGET_PLATFORM=win32
+if [[ -z "$TARGET_PLATFORM" ]]; then
+    TARGET_PLATFORM=win32
+fi
 
 apt update && apt -y install tar git zstd
 mkdir dist replay

.gitlab-ci.yml

@@ -95,7 +95,7 @@ exec_windows:
     - mat_windows
     - mat_submodules
   script:
-    - bash -c 'cp -rf premake/* .'
+    - bash -c 'cp -rf premake/* . ; cp -rf resource/* .'
     - '.\premake5.exe vs2019'
     - cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\msbuild.exe" build\YGOPro.sln /m /p:Configuration=Release'
     - copy bin\release\ygopro.exe .