irrtest

.travis.yml

@@ -3,6 +3,8 @@ os: osx
 sudo: required
 dist: trusty
 osx_image: xcode8
+env:
+- USE_IRRKLANG=mac
 before_install:
 - brew update > /dev/null
 - brew install freetype libevent sqlite dylibbundler > /dev/null
@@ -14,8 +16,8 @@ before_install:
 - cd ..
 
 - curl --location --retry 5 https://github.com/premake/premake-core/releases/download/v5.0.0-alpha12/premake-5.0.0-alpha12-macosx.tar.gz | tar zfx -
-- curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name http://downloads.sourceforge.net/irrlicht/irrlicht-1.8.4.zip
 
+- curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name http://downloads.sourceforge.net/irrlicht/irrlicht-1.8.4.zip
 - unzip -q irrlicht-1.8.4.zip 
 - cd irrlicht-1.8.4/
 - curl --location --retry 5 https://github.com/moecube/ygopro/raw/master/premake/irrlicht/irrlicht-mac.patch | patch -p1
@@ -25,6 +27,12 @@ before_install:
 - cp -rf ../../../include /usr/local/include/irrlicht 
 - cd ../../../../
 
+- 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
+- cp -rf irrKlang-1.5.0/lib/Win32-gcc/libirrKlang.a /usr/local/lib/
+- cp -rf irrKlang-1.5.0/include /usr/local/include/irrKlang
+- cp -rf irrKlang-1.5.0/irrKlang-1.5.0/bin/macosx-gcc *.dylib .
+
 script:
 - ./premake5 gmake --cc=clang
 - cd build
@@ -45,7 +53,7 @@ script:
 - security import cert.p12 -k build.keychain -P "$CERTIFICATE_PASSWORD" -T /usr/bin/codesign
 - codesign --deep --keychain build.keychain --sign "$(security find-identity -v -p codesigning build.keychain | head -1 | grep -o '".*"' | tr -d '"')" ygopro.app
 
-- zip -q -r ygopro-koishi-mac.zip ygopro.app
+- zip -q -r ygopro-koishi-mac.zip ygopro.app *.dylib
 
 deploy:
   provider: releases

gframe/premake4.lua

@@ -14,9 +14,10 @@ project "ygopro"
         includedirs { "../irrlicht/include", "../freetype/include", "../event/include", "../sqlite3" }
         if USE_IRRKLANG then
             defines { "YGOPRO_USE_IRRKLANG" }
-			links { "irrKlang", "ikpMP3" }
+            links { "irrKlang" }
             includedirs { "../irrklang/include" }
             if IRRKLANG_PRO then
+                links { "ikpMP3" }
                 defines { "IRRKLANG_STATIC" }
             end
             libdirs { "../irrklang/lib/Win32-visualStudio" }
@@ -30,3 +31,11 @@ project "ygopro"
         includedirs { "/usr/include/lua", "/usr/include/lua5.3", "/usr/include/lua/5.3", "/usr/include/irrlicht", "/usr/include/freetype2" }
         excludes { "COSOperator.*" }
         links { "event_pthreads", "GL", "dl", "pthread" }
+        if USE_IRRKLANG then
+            defines { "YGOPRO_USE_IRRKLANG" }
+            links { "irrKlang" }
+            includedirs { "/usr/include/irrKlang" }
+            if os.getenv("USE_IRRKLANG")=="mac" then
+                libdirs { "../irrklang/lib/Win32-visualStudio" }
+            end
+        end