mactest

.travis.yml

@@ -21,6 +21,7 @@ before_install:
     brew update > /dev/null;
     brew install freetype libevent sqlite dylibbundler > /dev/null;
     export USE_IRRKLANG=1;
+    export USE_IKPMP3=1;
   fi
 
 - curl --location --retry 5 http://www.lua.org/ftp/lua-5.3.4.tar.gz | tar zfx -
@@ -54,17 +55,13 @@ before_install:
   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
-- mv -f irrKlang-1.5.0 irrklang
-- sudo cp -rf irrklang/include /usr/local/include/irrKlang
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+    unzip -q irrKlang-32bit-1.5.0.zip;
+    mv -f irrKlang-1.5.0 irrklang;
+    sudo cp -rf irrklang/include /usr/local/include/irrKlang;
     sudo cp -rf irrklang/bin/macosx-gcc/*.dylib /usr/local/lib/;
-    cp -rf irrklang/bin/macosx-gcc/*.dylib .;
+    cp -rf irrklang/
   fi
-# - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-#     sudo cp -rf irrklang/bin/linux-gcc/*.so /usr/local/lib/;
-#     cp -rf irrklang/bin/linux-gcc/*.so .;
-#   fi
 
 script:
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./premake5 gmake --cc=clang; fi
@@ -92,7 +89,7 @@ script:
   fi
 
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    zip -q -r ygopro-koishi-$TRAVIS_OS_NAME.zip ygopro.app *.dylib;
+    zip -q -r ygopro-koishi-$TRAVIS_OS_NAME.zip ygopro.app;
   fi
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
     zip -q -r ygopro-koishi-$TRAVIS_OS_NAME.zip ygopro;

gframe/config.h

@@ -50,7 +50,7 @@ inline int _wtoi(const wchar_t * s) {
 #include <irrlicht.h>
 #ifdef YGOPRO_USE_IRRKLANG
 #include <irrKlang.h>
-#ifdef IRRKLANG_STATIC
+#ifdef YGOPRO_USE_IKPMP3
 #include "../ikpMP3/ikpMP3.h"
 #endif
 #endif

gframe/game.cpp

@@ -667,7 +667,7 @@ bool Game::Initialize() {
 #ifdef YGOPRO_USE_IRRKLANG
 	engineSound = irrklang::createIrrKlangDevice();
 	engineMusic = irrklang::createIrrKlangDevice();
-#ifdef IRRKLANG_STATIC
+#ifdef YGOPRO_USE_IKPMP3
 	if(engineMusic) {
 		irrklang::ikpMP3Init(engineSound);
 		irrklang::ikpMP3Init(engineMusic);

gframe/premake4.lua

@@ -17,7 +17,7 @@ project "ygopro"
             links { "irrKlang", "ikpMP3" }
             includedirs { "../irrklang/include" }
             if IRRKLANG_PRO then
-                defines { "IRRKLANG_STATIC" }
+                defines { "IRRKLANG_STATIC", "YGOPRO_USE_IKPMP3" }
             end
             libdirs { "../irrklang/lib/Win32-visualStudio" }
         end
@@ -31,6 +31,6 @@ project "ygopro"
         excludes { "COSOperator.*" }
         links { "event_pthreads", "GL", "dl", "pthread" }
         if USE_IRRKLANG then
-            defines { "YGOPRO_USE_IRRKLANG" }
+            defines { "YGOPRO_USE_IRRKLANG", "YGOPRO_USE_IKPMP3" }
             links { "irrKlang" }
         end

premake5.lua

@@ -7,6 +7,9 @@ solution "ygo"
         if os.getenv("irrklang_pro") then
             IRRKLANG_PRO = true
         end
+        if IRRKLANG_PRO or os.getenv("USE_IKPMP3") then
+		    USE_IKPMP3 = true
+        end
     end
     startproject "ygopro"
 
@@ -34,8 +37,6 @@ solution "ygo"
 
     configuration "linux"
         defines { "LUA_USE_LINUX" }
-        includedirs { "/usr/local/include", "/usr/local/include/*" }
-        libdirs { "/usr/local/lib" }
 
     configuration "Release"
         optimize "Speed"
@@ -77,7 +78,7 @@ solution "ygo"
 		include "irrlicht"
 		include "lua"
 		include "sqlite3"
-		if IRRKLANG_PRO then
-			include "ikpmp3"
-		end
+    end
+    if IRRKLANG_PRO or USE_IKPMP3 then
+        include "ikpmp3"
     end