adjust_lib_path

.travis.yml

@@ -57,11 +57,10 @@ before_install:
 - mv -f irrKlang-64bit-1.5.0 irrklang
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     mv -f irrklang/bin/macosx-gcc/libirrklang.dylib irrklang/bin/macosx-gcc/libirrKlang.dylib;
-    cp -rf irrklang/bin/macosx-gcc/*.dylib .;
     sudo cp -rf irrklang/bin/macosx-gcc/*.dylib /usr/local/lib/;
   fi
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-    mv -f irrklang/bin/linux-gcc-64/libIrrKlang.so irrklang/bin/linux-gcc-64/libirrKlang.so;
+    mv -f irrklang/bin/linux-gcc-64/libIrrKlang.so libirrKlang.so;
     cp -rf irrklang/bin/linux-gcc-64/*.so .;
   fi
 
@@ -90,11 +89,11 @@ script:
     fi
   fi
 
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
     zip -q -r ygopro-koishi-$TRAVIS_OS_NAME.zip ygopro *.so;
   fi
-- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-    zip -q -r ygopro-koishi-$TRAVIS_OS_NAME.zip ygopro.app *.dylib;
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+    zip -q -r ygopro-koishi-$TRAVIS_OS_NAME.zip ygopro.app;
   fi
 
 deploy:

gframe/premake4.lua

@@ -35,10 +35,6 @@ project "ygopro"
         links { "event_pthreads", "GL", "dl", "pthread" }
     configuration "linux"
         if USE_IRRKLANG then
-            linkoptions{ "-Wl,-rpath=./irrklang/bin/linux-gcc-64/" }
+            linkoptions{ "-Wl,-rpath=." }
             libdirs { "../irrklang/bin/linux-gcc-64" }
         end
-    configuration "macosx"
-        if USE_IRRKLANG then
-            libdirs { "../irrklang/bin/macosx-gcc" }
-        end