Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed redudant builds and removed -j4 to try to compile emscripten

Browse Source
This commit is contained in:
xawotihs
2016-06-23 21:20:12 +02:00
parent 4b3a2531a6
commit fc9a4d5431
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@@ -8,8 +8,6 @@ matrix:
env: BUILD_TYPE=SDL env: BUILD_TYPE=SDL
- os: linux - os: linux
env: BUILD_TYPE=Qt env: BUILD_TYPE=Qt
- os: osx
env: BUILD_TYPE=SDL
- os: osx - os: osx
env: BUILD_TYPE=Qt env: BUILD_TYPE=Qt
- os: osx - os: osx
@@ -19,8 +17,6 @@ matrix:
env: BUILD_TYPE=ANDROID env: BUILD_TYPE=ANDROID
- os: osx - os: osx
env: BUILD_TYPE=Emscripten env: BUILD_TYPE=Emscripten
- os: linux
env: BUILD_TYPE=Emscripten
android: android:
components: components:
@@ -77,10 +73,6 @@ before_install:
- if [ "$BUILD_TYPE" == "Emscripten" ] && [ "$TRAVIS_OS_NAME" == "osx" ]; then - if [ "$BUILD_TYPE" == "Emscripten" ] && [ "$TRAVIS_OS_NAME" == "osx" ]; then
brew install emscripten && export LLVM=/usr/local/opt/emscripten/libexec/llvm/bin && emcc; brew install emscripten && export LLVM=/usr/local/opt/emscripten/libexec/llvm/bin && emcc;
fi fi
- if [ "$BUILD_TYPE" == "Emscripten" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then
git clone --depth 1 https://github.com/urho3d/emscripten-sdk.git && emscripten-sdk/emsdk activate --build=Release sdk-master-64bit && source emscripten-sdk/emsdk_env.sh &&
export PATH=$(whereis -b ccache |grep -o '\S*lib\S*'):$PATH; for f in $EMSCRIPTEN/{emcc,em++}; do touch -d "2015-09-01 00:00:00 +0800" $f; done;
fi
install: install:
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then - if [ "$TRAVIS_OS_NAME" == "linux" ]; then

2
tools/travis-script.sh
View File

@@ -56,7 +56,7 @@ if [ "$BUILD_TYPE" = "Emscripten" ]; then
mkdir build_emscripten mkdir build_emscripten
cd build_emscripten cd build_emscripten
emcmake cmake -DCMAKE_BUILD_TYPE=Debug .. emcmake cmake -DCMAKE_BUILD_TYPE=Debug ..
emmake make -j4 emmake make
cd .. cd ..
fi fi