mvlibpath

.travis.yml

@@ -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;
     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/;
     mv -f irrklang/plugins/ikpMP3 ikpmp3;
     cp -rf premake/ikpmp3 .;

gframe/premake4.lua

@@ -10,6 +10,7 @@ project "ygopro"
     if USE_IRRKLANG then
         defines { "YGOPRO_USE_IRRKLANG" }
         links { "irrKlang" }
+        includedirs { "../irrklang/include" }
         if USE_IKPMP3 then
 		    links { "ikpMP3" }
             defines { "YGOPRO_USE_IKPMP3" }
@@ -24,7 +25,6 @@ project "ygopro"
         excludes "CGUIButton.cpp"
         includedirs { "../irrlicht/include", "../freetype/include", "../event/include", "../sqlite3" }
         if USE_IRRKLANG then
-            includedirs { "../irrklang/include" }
             libdirs { "../irrklang/lib/Win32-visualStudio" }
         end
         links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32" }

premake/ikpmp3/premake4.lua

@@ -2,6 +2,4 @@ project "ikpMP3"
     kind "StaticLib"
 
     files { "*.cpp", "*.h", "decoder/*.c", "decoder/*.h" }
-    if os.ishost("windows") then
-        includedirs { "../irrklang/include" }
-    end
\ No newline at end of file
+    includedirs { "../irrklang/include" }