Commit f8fe5d74 authored by nanahira's avatar nanahira

irrklang vs2019 and new lib

parent 9ce80460
...@@ -34,7 +34,7 @@ before_install: ...@@ -34,7 +34,7 @@ before_install:
cp premake/lua/premake4.lua lua/; cp premake/lua/premake4.lua lua/;
fi fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir irrlicht ; cd irrlicht ; curl --retry 5 --location https://github.com/moecube/irrlicht/releases/download/test/irrlicht-mycard-mac.tar.gz | tar zfx - ; cp libIrrlicht.a /usr/local/lib/ ; sudo cp -r include /usr/local/include/irrlicht ; cd .. ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir irrlicht ; cd irrlicht ; curl --retry 5 --location https://github.com/moecube/irrlicht/releases/download/test/irrlicht-mycard-mac.tar.gz | tar zfx - ; cd .. ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
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 --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 -;
......
...@@ -38,12 +38,12 @@ project "ygopro" ...@@ -38,12 +38,12 @@ project "ygopro"
end end
links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32" } links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32" }
if IRRKLANG_PRO then if IRRKLANG_PRO then
configuration { "windows", "not vs2017" } configuration { "windows", "not vs2017", "not vs2019" }
libdirs { "../irrklang/lib/Win32-visualStudio" } libdirs { "../irrklang/lib/Win32-visualStudio" }
configuration { "windows", "vs2017" } configuration { "windows", "vs2017" }
libdirs { "../irrklang/lib/Win32-vs2017" } libdirs { "../irrklang/lib/Win32-vs2017" }
configuration { "windows", "vs2019" } configuration { "windows", "vs2019" }
libdirs { "../irrklang/lib/Win32-vs2017" } libdirs { "../irrklang/lib/Win32-vs2019" }
end end
configuration {"windows", "not vs*"} configuration {"windows", "not vs*"}
includedirs { "/mingw/include/irrlicht", "/mingw/include/freetype2" } includedirs { "/mingw/include/irrlicht", "/mingw/include/freetype2" }
...@@ -67,8 +67,8 @@ project "ygopro" ...@@ -67,8 +67,8 @@ project "ygopro"
libdirs { "../irrklang/bin/linux-gcc-64" } libdirs { "../irrklang/bin/linux-gcc-64" }
end end
configuration "macosx" configuration "macosx"
includedirs { "/usr/include/irrlicht" } includedirs { "../irrlicht/include" }
links { "lua" } libdirs { "../irrlicht" }
if USE_IRRKLANG then if USE_IRRKLANG then
links { "irrklang" } links { "irrklang" }
libdirs { "../irrklang/bin/macosx-gcc" } libdirs { "../irrklang/bin/macosx-gcc" }
......
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