Commit 3a70cc87 authored by nanahira's avatar nanahira

mvlibpath

parent 578fbb16
...@@ -58,7 +58,6 @@ before_install: ...@@ -58,7 +58,6 @@ before_install:
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; unzip -q irrKlang-32bit-1.5.0.zip;
mv -f irrKlang-1.5.0 irrklang; 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/;
mv -f irrklang/plugins/ikpMP3 ikpmp3; mv -f irrklang/plugins/ikpMP3 ikpmp3;
cp -rf premake/ikpmp3 .; cp -rf premake/ikpmp3 .;
......
...@@ -10,6 +10,7 @@ project "ygopro" ...@@ -10,6 +10,7 @@ project "ygopro"
if USE_IRRKLANG then if USE_IRRKLANG then
defines { "YGOPRO_USE_IRRKLANG" } defines { "YGOPRO_USE_IRRKLANG" }
links { "irrKlang" } links { "irrKlang" }
includedirs { "../irrklang/include" }
if USE_IKPMP3 then if USE_IKPMP3 then
links { "ikpMP3" } links { "ikpMP3" }
defines { "YGOPRO_USE_IKPMP3" } defines { "YGOPRO_USE_IKPMP3" }
...@@ -24,7 +25,6 @@ project "ygopro" ...@@ -24,7 +25,6 @@ project "ygopro"
excludes "CGUIButton.cpp" excludes "CGUIButton.cpp"
includedirs { "../irrlicht/include", "../freetype/include", "../event/include", "../sqlite3" } includedirs { "../irrlicht/include", "../freetype/include", "../event/include", "../sqlite3" }
if USE_IRRKLANG then if USE_IRRKLANG then
includedirs { "../irrklang/include" }
libdirs { "../irrklang/lib/Win32-visualStudio" } libdirs { "../irrklang/lib/Win32-visualStudio" }
end end
links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32" } links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32" }
......
...@@ -2,6 +2,4 @@ project "ikpMP3" ...@@ -2,6 +2,4 @@ project "ikpMP3"
kind "StaticLib" kind "StaticLib"
files { "*.cpp", "*.h", "decoder/*.c", "decoder/*.h" } files { "*.cpp", "*.h", "decoder/*.c", "decoder/*.h" }
if os.ishost("windows") then includedirs { "../irrklang/include" }
includedirs { "../irrklang/include" }
end
\ No newline at end of file
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