Tries to build emscripten on linux as macosx fails
This commit is contained in:
+7
-1
@@ -19,6 +19,8 @@ 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:
|
||||||
@@ -72,9 +74,13 @@ before_install:
|
|||||||
export SDL2DIR="$TRAVIS_BUILD_DIR/thirdparty/SDL2";
|
export SDL2DIR="$TRAVIS_BUILD_DIR/thirdparty/SDL2";
|
||||||
fi
|
fi
|
||||||
# Building for Emscripten here
|
# Building for Emscripten here
|
||||||
- if [ "$BUILD_TYPE" == "Emscripten" ]; 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
|
||||||
|
|||||||
Reference in New Issue
Block a user