Commit ce04167e authored by nanahira's avatar nanahira

no_linux_irrklang_for_now

parent cc356594
...@@ -5,8 +5,8 @@ os: ...@@ -5,8 +5,8 @@ os:
sudo: required sudo: required
dist: trusty dist: trusty
osx_image: xcode8 osx_image: xcode8
env: #env:
- USE_IRRKLANG=1 #- USE_IRRKLANG=1
addons: addons:
ssh_known_hosts: ssh_known_hosts:
- github.com - github.com
...@@ -22,6 +22,7 @@ before_install: ...@@ -22,6 +22,7 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
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
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 -
...@@ -62,10 +63,10 @@ before_install: ...@@ -62,10 +63,10 @@ before_install:
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/bin/macosx-gcc/*.dylib .;
fi fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then #- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
sudo cp -rf irrklang/bin/linux-gcc/*.so /usr/local/lib/; # sudo cp -rf irrklang/bin/linux-gcc/*.so /usr/local/lib/;
cp -rf irrklang/bin/linux-gcc/*.so .; # cp -rf irrklang/bin/linux-gcc/*.so .;
fi # 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
...@@ -96,7 +97,8 @@ script: ...@@ -96,7 +97,8 @@ script:
zip -q -r ygopro-koishi-$TRAVIS_OS_NAME.zip ygopro.app *.dylib; zip -q -r ygopro-koishi-$TRAVIS_OS_NAME.zip ygopro.app *.dylib;
fi fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
zip -q -r ygopro-koishi-$TRAVIS_OS_NAME.zip ygopro.app *.so; #zip -q -r ygopro-koishi-$TRAVIS_OS_NAME.zip ygopro *.so;
zip -q -r ygopro-koishi-$TRAVIS_OS_NAME.zip ygopro;
fi fi
deploy: deploy:
......
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