tmps

.ci/pack-linux.sh

@@ -6,4 +6,4 @@ set -o errexit
 apt update && apt -y install tar git
 git submodule update --init
 mkdir dist replay
-tar -zcf dist/KoishiPro-$CI_COMMIT_REF_NAME-linux-$TARGET_LOCALE.tar.gz --exclude='.git*' ygopro LICENSE README.md libIrrKlang.so lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound windbot bot bot.conf locales fonts
+tar -zcf dist/KoishiPro-$CI_COMMIT_REF_NAME-linux-$TARGET_LOCALE.tar.gz --exclude='.git*' 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

.gitignore

@@ -63,6 +63,7 @@ build
 /update
 /update*
 /locales
+/lib
 
 # ygopro main program
 /ygopro

.gitlab-ci.yml

@@ -153,17 +153,18 @@ exec_linux:
   script:
     - apt update; apt -y install git build-essential libfreetype6-dev libgl1-mesa-dev libglu-dev libxxf86vm-dev
     - git submodule update --init
-    - env YGOPRO_LINUX_ALL_STATIC_LIBEVENT_PATH=$PWD/libevent-stable ./premake5 gmake
+    - mkdir lib
+    - cp -rf irrklang/bin/linux-gcc-64/libIrrKlang.so ./lib/
+    - ./premake5 gmake
     - cd build
     - make config=release -j$(nproc)
     - cd ..
     - mv bin/release/ygopro .
     - strip ygopro
-    - cp -rf irrklang/bin/linux-gcc-64/libIrrKlang.so .
   artifacts:
     paths:
       - ygopro
-      - libIrrKlang.so
+      - lib
 
 exec_macos:
   stage: build

gframe/premake4.lua

@@ -89,9 +89,9 @@ project "ygopro"
             end
             linkoptions { libeventRootPrefix.."libevent.a", libeventRootPrefix.."libevent_pthreads.a" }
         end
+        linkoptions{ "-Wl,-rpath=./lib/" }
         if USE_IRRKLANG then
             links { "IrrKlang" }
-            linkoptions{ "-Wl,-rpath=./" }
             libdirs { "../irrklang/bin/linux-gcc-64" }
         end
     configuration "macosx"