update_mac

.travis.yml

@@ -55,20 +55,21 @@ before_install:
 - curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name http://www.ambiera.at/downloads/irrKlang-64bit-1.5.0.zip
 - unzip -q irrKlang-64bit-1.5.0.zip
 - mv -f irrKlang-64bit-1.5.0 irrklang
+- mv -f irrklang/plugins/ikpMP3 ikpmp3
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     mv -f irrklang/bin/macosx-gcc/libirrklang.dylib irrklang/bin/macosx-gcc/libirrKlang.dylib;
-    sudo cp -rf irrklang/bin/macosx-gcc/*.dylib /usr/local/lib/;
+    sudo cp -rf irrklang/bin/macosx-gcc/libirrKlang.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;
-    cp -rf irrklang/bin/linux-gcc-64/*.so .;
+    cp -rf irrklang/bin/linux-gcc-64/libirrKlang.so .;
   fi
 
 script:
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./premake5 gmake --cc=clang; fi
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./premake5 gmake; fi
 - cd build
-- make config=release ygopro
+- make config=release ygopro -j4
 - cd ..
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mv -f bin/release/ygopro ./; strip ygopro;
   fi
@@ -90,7 +91,7 @@ script:
   fi
 
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-    zip -q -r ygopro-koishi-$TRAVIS_OS_NAME.zip ygopro *.so;
+    zip -q -r ygopro-koishi-$TRAVIS_OS_NAME.zip ygopro libirrKlang.so;
   fi
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     zip -q -r ygopro-koishi-$TRAVIS_OS_NAME.zip ygopro.app;
@@ -100,6 +101,7 @@ deploy:
   provider: releases
   file: ygopro-koishi-$TRAVIS_OS_NAME.zip
   skip_cleanup: true
+  overwrite: true
   on:
     tags: true
   api-key: $NANAHIRA

gframe/premake4.lua

@@ -9,10 +9,9 @@ project "ygopro"
     links { "ocgcore", "clzma", "Irrlicht", "freetype", "sqlite3", "lua" , "event" }
     if USE_IRRKLANG then
         defines { "YGOPRO_USE_IRRKLANG" }
-        links { "irrKlang" }
+        links { "irrKlang", "ikpmp3" }
         includedirs { "../irrklang/include" }
         if IRRKLANG_PRO then
-		    links { "ikpMP3" }
             defines { "IRRKLANG_STATIC" }
         end
     end

gframe/sound_manager.cpp

@@ -16,9 +16,7 @@ bool SoundManager::Init() {
 	if(!engineSound || !engineMusic) {
 		return false;
 	} else {
-#ifdef IRRKLANG_STATIC
 		irrklang::ikpMP3Init(engineMusic);
-#endif
 		return true;
 	}
 #endif // YGOPRO_USE_IRRKLANG

gframe/sound_manager.h

@@ -5,10 +5,8 @@
 #include "game.h"
 #ifdef YGOPRO_USE_IRRKLANG
 #include <irrKlang.h>
-#ifdef IRRKLANG_STATIC
 #include "../ikpmp3/ikpMP3.h"
 #endif
-#endif
 
 #define wcsicmp _wcsicmp
 

premake5.lua

@@ -8,7 +8,6 @@ solution "ygo"
             IRRKLANG_PRO = true
         end
     end
-    startproject "ygopro"
 
     configurations { "Debug", "Release" }
     defines { "LUA_COMPAT_5_2" }
@@ -76,6 +75,6 @@ solution "ygo"
 		include "lua"
 		include "sqlite3"
 	end
-	if IRRKLANG_PRO then
+	if USE_IRRKLANG then
 		include "ikpmp3"
 	end