linux_test

.travis.yml

@@ -16,6 +16,8 @@ addons:
     - libirrlicht-dev
     - libgl1-mesa-dev
     - libglu-dev
+env:
+- USE_IRRKLANG=1
 before_install:
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     brew update > /dev/null;
@@ -25,12 +27,11 @@ before_install:
 - curl --location --retry 5 http://www.lua.org/ftp/lua-5.3.4.tar.gz | tar zfx -
 - cd lua-5.3.4
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    make macosx test;
+    sudo make macosx test install > /dev/null;
   fi
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-    make linux test;
+    sudo make linux test install > /dev/null;
   fi
-- sudo make install
 - cd ..
 
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
@@ -51,6 +52,15 @@ before_install:
     sudo cp -rf ../../../include /usr/local/include/irrlicht;
     cd ../../../../;
   fi
+- curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name http://www.ambiera.at/downloads/irrKlang-32bit-1.5.0.zip
+- unzip -q irrKlang-32bit-1.5.0.zip
+- move irrKlang-1.5.0 irrklang
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+    cp -rf irrklang/bin/macosx-gcc/*.dylib .;
+  fi
+- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+    cp -rf irrklang/bin/linux-gcc/*.so .;
+  fi
 
 script:
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./premake5 gmake --cc=clang; fi
@@ -78,10 +88,10 @@ script:
   fi
 
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    zip -q -r ygopro-koishi-$TRAVIS_OS_NAME.zip ygopro.app;
+    zip -q -r ygopro-koishi-$TRAVIS_OS_NAME.zip ygopro.app *.so;
   fi
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-    zip -q -r ygopro-koishi-$TRAVIS_OS_NAME.zip ygopro;
+    zip -q -r ygopro-koishi-$TRAVIS_OS_NAME.zip ygopro *.dylib;
   fi
 
 deploy:

gframe/premake4.lua

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