Merge branch 'master' into server

00b2037e · nanahira · df589131 · d3e2d3a0 · 00b2037e · 00b2037e
Commit 00b2037e authored Jun 25, 2022 by nanahira
Showing with 6 additions and 6 deletions

.ci/exec-macos-platform.sh .ci/exec-macos-platform.sh +3 -3

.ci/pack-macos-dlc.sh .ci/pack-macos-dlc.sh +1 -1

.ci/pack-macos.sh .ci/pack-macos.sh +1 -1

script script +1 -1

No files found.
--- a/.ci/exec-macos-platform.sh
+++ b/.ci/exec-macos-platform.sh
@@ -17,8 +17,8 @@ cd ..
 mkdir ygopro-platforms
 mv bin/release/YGOPro.app $TARGET_YGOPRO_BINARY_PATH

-if [[ $TARGET_PLATFORM == "x86" ]]; then
-  install_name_tool -change /usr/local/lib/libirrklang.dylib @executable_path/../Frameworks/libirrklang.dylib $TARGET_YGOPRO_BINARY_PATH
-fi
+#if [[ $TARGET_PLATFORM == "x86" ]]; then
+#  install_name_tool -change /usr/local/lib/libirrklang.dylib @executable_path/../Frameworks/libirrklang.dylib $TARGET_YGOPRO_BINARY_PATH
+#fi

 strip $TARGET_YGOPRO_BINARY_PATH
--- a/.ci/pack-macos-dlc.sh
+++ b/.ci/pack-macos-dlc.sh
@@ -2,7 +2,7 @@
 set -x
 set -o errexit

-ARCHIVE_FILES=(ygopro.app cards.cdb locales fonts sound textures strings.conf system.conf)
+ARCHIVE_FILES=(ygopro.app cards.cdb locales fonts textures strings.conf system.conf)

 TARGET_PLATFORM=darwin


--- a/.ci/pack-macos.sh
+++ b/.ci/pack-macos.sh
@@ -2,7 +2,7 @@
 set -x
 set -o errexit

-ARCHIVE_FILES=(ygopro.app LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound windbot bot bot.conf locales fonts)
+ARCHIVE_FILES=(ygopro.app LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay windbot bot bot.conf locales fonts)

 # TARGET_LOCALE
 # ARCHIVE_SUFFIX

--- a/script @ dd222d32
+++ b/script @ dd222d32
-Subproject commit fc9d56a2595aa662c218c5c4feb7b43d477553f2
+Subproject commit dd222d324189d303d9427cd746182c32ee1d5bf7