Commit e4a0a88f authored by mercury233's avatar mercury233

bulid osx lua

parent 51b7f6b6
......@@ -34,15 +34,16 @@ before_install:
# - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo ln -s /usr/bin/gcc-6 /usr/local/bin/gcc; sudo ln -s /usr/bin/g++-6 /usr/local/bin/g++; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
brew update;
brew install freetype libevent sqlite lua dylibbundler;
brew install freetype libevent sqlite dylibbundler;
sudo cp -r /usr/local/include/freetype2 ./freetype2;
sudo cp -r /usr/local/include/event2 ./event2;
sudo cp -r /usr/local/include/lua ./lua;
sudo rm -rf /usr/local/include/*;
sudo cp -r ./freetype2 /usr/local/include/freetype2;
sudo cp -r ./event2 /usr/local/include/event2;
sudo cp -r ./lua /usr/local/include/lua;
ls /usr/local/lib/;
curl --retry 5 --location https://www.lua.org/ftp/lua-5.3.5.tar.gz | tar zfx -;
move lua-5.3.5/src lua;
cp premake/lua/premake4.lua lua/;
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
......
......@@ -43,7 +43,7 @@ project "ygopro"
libdirs { "../irrklang/bin/linux-gcc-64" }
end
configuration "macosx"
links { "lua-c++" }
links { "lua" }
if USE_IRRKLANG then
links { "irrklang" }
libdirs { "../irrklang/bin/macosx-gcc" }
......
Subproject commit 3b728f929be0baf6c0d5cd339b3b864a1684633c
Subproject commit cfdfd777419c6d4ae5d753a188a1bfc51f0d6b66
......@@ -76,6 +76,9 @@ solution "ygo"
include "ocgcore"
include "gframe"
if os.ishost("macosx") then
include "lua"
end
if os.ishost("windows") then
include "lua"
include "event"
......
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