Commit 48e12bf6 authored by nanahira's avatar nanahira

mactest

parent a0fbfdfe
...@@ -21,6 +21,7 @@ before_install: ...@@ -21,6 +21,7 @@ before_install:
brew update > /dev/null; brew update > /dev/null;
brew install freetype libevent sqlite dylibbundler > /dev/null; brew install freetype libevent sqlite dylibbundler > /dev/null;
export USE_IRRKLANG=1; export USE_IRRKLANG=1;
export USE_IKPMP3=1;
fi fi
- curl --location --retry 5 http://www.lua.org/ftp/lua-5.3.4.tar.gz | tar zfx - - curl --location --retry 5 http://www.lua.org/ftp/lua-5.3.4.tar.gz | tar zfx -
...@@ -54,17 +55,13 @@ before_install: ...@@ -54,17 +55,13 @@ before_install:
fi fi
- curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name http://www.ambiera.at/downloads/irrKlang-32bit-1.5.0.zip - 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 - 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/; sudo cp -rf irrklang/bin/macosx-gcc/*.dylib /usr/local/lib/;
cp -rf irrklang/bin/macosx-gcc/*.dylib .; cp -rf irrklang/
fi 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: script:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./premake5 gmake --cc=clang; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./premake5 gmake --cc=clang; fi
...@@ -92,7 +89,7 @@ script: ...@@ -92,7 +89,7 @@ script:
fi fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - 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 fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - 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;
......
...@@ -50,7 +50,7 @@ inline int _wtoi(const wchar_t * s) { ...@@ -50,7 +50,7 @@ inline int _wtoi(const wchar_t * s) {
#include <irrlicht.h> #include <irrlicht.h>
#ifdef YGOPRO_USE_IRRKLANG #ifdef YGOPRO_USE_IRRKLANG
#include <irrKlang.h> #include <irrKlang.h>
#ifdef IRRKLANG_STATIC #ifdef YGOPRO_USE_IKPMP3
#include "../ikpMP3/ikpMP3.h" #include "../ikpMP3/ikpMP3.h"
#endif #endif
#endif #endif
......
...@@ -667,7 +667,7 @@ bool Game::Initialize() { ...@@ -667,7 +667,7 @@ bool Game::Initialize() {
#ifdef YGOPRO_USE_IRRKLANG #ifdef YGOPRO_USE_IRRKLANG
engineSound = irrklang::createIrrKlangDevice(); engineSound = irrklang::createIrrKlangDevice();
engineMusic = irrklang::createIrrKlangDevice(); engineMusic = irrklang::createIrrKlangDevice();
#ifdef IRRKLANG_STATIC #ifdef YGOPRO_USE_IKPMP3
if(engineMusic) { if(engineMusic) {
irrklang::ikpMP3Init(engineSound); irrklang::ikpMP3Init(engineSound);
irrklang::ikpMP3Init(engineMusic); irrklang::ikpMP3Init(engineMusic);
......
...@@ -17,7 +17,7 @@ project "ygopro" ...@@ -17,7 +17,7 @@ project "ygopro"
links { "irrKlang", "ikpMP3" } links { "irrKlang", "ikpMP3" }
includedirs { "../irrklang/include" } includedirs { "../irrklang/include" }
if IRRKLANG_PRO then if IRRKLANG_PRO then
defines { "IRRKLANG_STATIC" } defines { "IRRKLANG_STATIC", "YGOPRO_USE_IKPMP3" }
end end
libdirs { "../irrklang/lib/Win32-visualStudio" } libdirs { "../irrklang/lib/Win32-visualStudio" }
end end
...@@ -31,6 +31,6 @@ project "ygopro" ...@@ -31,6 +31,6 @@ project "ygopro"
excludes { "COSOperator.*" } excludes { "COSOperator.*" }
links { "event_pthreads", "GL", "dl", "pthread" } links { "event_pthreads", "GL", "dl", "pthread" }
if USE_IRRKLANG then if USE_IRRKLANG then
defines { "YGOPRO_USE_IRRKLANG" } defines { "YGOPRO_USE_IRRKLANG", "YGOPRO_USE_IKPMP3" }
links { "irrKlang" } links { "irrKlang" }
end end
...@@ -7,6 +7,9 @@ solution "ygo" ...@@ -7,6 +7,9 @@ solution "ygo"
if os.getenv("irrklang_pro") then if os.getenv("irrklang_pro") then
IRRKLANG_PRO = true IRRKLANG_PRO = true
end end
if IRRKLANG_PRO or os.getenv("USE_IKPMP3") then
USE_IKPMP3 = true
end
end end
startproject "ygopro" startproject "ygopro"
...@@ -34,8 +37,6 @@ solution "ygo" ...@@ -34,8 +37,6 @@ solution "ygo"
configuration "linux" configuration "linux"
defines { "LUA_USE_LINUX" } defines { "LUA_USE_LINUX" }
includedirs { "/usr/local/include", "/usr/local/include/*" }
libdirs { "/usr/local/lib" }
configuration "Release" configuration "Release"
optimize "Speed" optimize "Speed"
...@@ -77,7 +78,7 @@ solution "ygo" ...@@ -77,7 +78,7 @@ solution "ygo"
include "irrlicht" include "irrlicht"
include "lua" include "lua"
include "sqlite3" include "sqlite3"
if IRRKLANG_PRO then end
include "ikpmp3" if IRRKLANG_PRO or USE_IKPMP3 then
end include "ikpmp3"
end end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment