clean irrklang from ci

.ci/pack-linux-dlc.sh

@@ -2,7 +2,7 @@
 set -x
 set -o errexit
 
-ARCHIVE_FILES=(ygopro lib cards.cdb locales fonts sound textures strings.conf system.conf pack)
+ARCHIVE_FILES=(ygopro cards.cdb locales fonts sound textures strings.conf system.conf pack)
 
 TARGET_PLATFORM=linux
 

.ci/pack-linux.sh

@@ -2,7 +2,7 @@
 set -x
 set -o errexit
 
-ARCHIVE_FILES=(ygopro LICENSE README.md lib lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound windbot bot bot.conf locales fonts pack)
+ARCHIVE_FILES=(ygopro LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound windbot bot bot.conf locales fonts pack)
 
 # TARGET_LOCALE
 # ARCHIVE_SUFFIX

.gitlab-ci.yml

@@ -44,21 +44,6 @@ mat_submodules:
       - ocgcore
       - script
 
-mat_irrklang:
-  stage: prepare
-  tags:
-    - linux
-  script:
-    - apt update; apt -y install git
-    - mkdir -p ~/.ssh; chmod 700 ~/.ssh; echo "$NANAHIRA_SSH_KEY" | base64 --decode > ~/.ssh/id_rsa; chmod 600 ~/.ssh/id_rsa
-    - ssh-keyscan git.mycard.moe >> ~/.ssh/known_hosts
-    - git clone --depth=1 git@git.mycard.moe:nanahira/irrklang
-    #- mv -f irrklang/plugins/ikpmp3 .
-  artifacts:
-    paths:
-      - irrklang
-      - ikpmp3
-
 mat_linux:
   stage: prepare
   tags:
@@ -75,17 +60,6 @@ mat_linux:
       - irrlicht
       - libevent-stable
 
-#mat_macos_irrklang_patched:
-#  stage: build
-#  tags:
-#    - linux
-#  dependencies: []
-#  script:
-#    - wget -O - https://cdn01.moecube.com/ygopro-build-materials/libirrklang-patched-dylib.tar.gz | tar zfx -
-#  artifacts:
-#    paths:
-#      - libirrklang-patched.dylib
-
 mat_macos:
   stage: prepare
   tags:
@@ -93,7 +67,6 @@ mat_macos:
   script:
     - apt update; apt -y install wget tar
     - wget -O - https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-beta2-macosx.tar.gz | tar zfx -
-    # - wget -O - https://cdn01.moecube.com/ygopro-build-materials/libirrklang-patched-dylib.tar.gz | tar zfx -
     - mkdir irrlicht
     - cd irrlicht
     - wget -O - https://cdn01.moecube.com/ygopro-build-materials/irrlicht-mycard-mac.tar.gz | tar zfx -
@@ -139,12 +112,11 @@ exec_windows:
     - vs
   dependencies:
     - mat_common
-    - mat_irrklang
     - mat_windows
     - mat_submodules
   script:
     - bash -c 'cp -rf premake/* .'
-    - '.\premake5.exe vs2019 --irrklang-pro'
+    - '.\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 .
   artifacts:
@@ -158,17 +130,13 @@ exec_linux:
   image: git-registry.mycard.moe/mycard/docker-runner-base:debian11
   dependencies:
     - mat_common
-    - mat_irrklang
     - mat_linux
     - mat_submodules
   script:
     - apt update; apt -y install git build-essential libgl1-mesa-dev libglu-dev libxxf86vm-dev
-    - mkdir lib
-    - cp -rf irrklang/bin/linux-gcc-64/libIrrKlang.so ./lib/
-    # - cp -rf irrklang/bin/linux-gcc-64/ikpMP3.so ./lib/
     - export EVENT_INCLUDE_DIR=$PWD/libevent-stable/include
     - export EVENT_LIB_DIR=$PWD/libevent-stable/lib
-    - ./premake5 gmake --build-freetype --build-sqlite --build-irrlicht --build-ikpmp3 --irrklang-pro
+    - ./premake5 gmake --build-freetype --build-sqlite --build-irrlicht
     - cd build
     - make config=release -j$(nproc)
     - cd ..
@@ -177,7 +145,6 @@ exec_linux:
   artifacts:
     paths:
       - ygopro
-      - lib
 
 ._exec_macos_platform:
   extends: ._exec_build
@@ -211,15 +178,9 @@ exec_macos:
   dependencies:
     - exec_macos_platform_x86
     - exec_macos_platform_m1
-    #- mat_macos_irrklang_patched
   script:
     - mkdir -p ygopro.app/Contents/MacOS ygopro.app/Contents/Frameworks;
     - lipo -create -output ygopro.app/Contents/MacOS/ygopro $(ls -1 ygopro-platforms/ygopro-platform-*);
-    # do some special things for irrklang
-    #- mv ./libirrklang-patched.dylib ygopro.app/Contents/Frameworks/libirrklang.dylib 
-    #- install_name_tool -change /usr/local/lib/libirrklang.dylib @executable_path/../Frameworks/libirrklang.dylib ygopro.app/Contents/MacOS/ygopro
-    #- dylibbundler -x ygopro.app/Contents/MacOS/ygopro -b -d ygopro.app/Contents/Frameworks/ -p @executable_path/../Frameworks/ -cd -i @executable_path/../Frameworks;
-    #- strip ygopro.app/Contents/MacOS/ygopro;
     - mkdir ygopro.app/Contents/Resources;
     - mv premake/gframe/ygopro.icns ygopro.app/Contents/Resources/Icon.icns;
     - defaults write "$PWD/ygopro.app/Contents/Info.plist" "CFBundleIconFile" "Icon.icns";