UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to use latest emscripten and android ndk

Browse source 
- To support ASYNCIFY instead of EMTERPRETER
 - No need to generate a standalone toolchain for Android NDK
This commit is contained in:
Ray 2020-04-26 13:46:15 +02:00 • committed by GitHub
parent 72cc3e0530
commit ce2e48af52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.travis.yml
View file

@ -59,7 +59,7 @@ before_install:
if [[ "$ARCH" == *-android ]]; then if [[ "$ARCH" == *-android ]]; then
export DONT_TEST=1; export DONT_TEST=1;
export RAYLIB_PACKAGE_SUFFIX="-Android-arm64"; export RAYLIB_PACKAGE_SUFFIX="-Android-arm64";
wget https://dl.google.com/android/repository/android-ndk-r17-linux-x86_64.zip; wget https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip;
unzip -qq android-ndk*.zip; unzip -qq android-ndk*.zip;
if [[ "$ARCH" == arm64-* ]]; then if [[ "$ARCH" == arm64-* ]]; then
export RAYLIB_PACKAGE_SUFFIX="-Android-arm64"; export RAYLIB_PACKAGE_SUFFIX="-Android-arm64";
@ -70,15 +70,14 @@ before_install:
TOOLCHAIN_ARCH=arm; TOOLCHAIN_ARCH=arm;
PREFIX=arm-linux-androideabi-; PREFIX=arm-linux-androideabi-;
fi; fi;
android-ndk*/build/tools/make_standalone_toolchain.py --arch $TOOLCHAIN_ARCH --api 21 --install-dir /tmp/android-toolchain; export PATH=/android-ndk*/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH;
export PATH=/tmp/android-toolchain/bin:$PATH;
export CC=${PREFIX}clang; export CC=${PREFIX}clang;
export CXX=${PREFIX}clang++; export CXX=${PREFIX}clang++;
export CMAKE_ARCH_ARGS='-DPLATFORM=Android'; export CMAKE_ARCH_ARGS='-DPLATFORM=Android';
elif [ "$ARCH" == "html5" ]; then elif [ "$ARCH" == "html5" ]; then
export DONT_TEST=1; export DONT_TEST=1;
export RAYLIB_PACKAGE_SUFFIX="-html5"; export RAYLIB_PACKAGE_SUFFIX="-html5";
docker run --privileged=true -dit --name emscripten -v $(pwd):/src trzeci/emscripten:sdk-incoming-64bit bash; docker run --privileged=true -dit --name emscripten -v $(pwd):/src trzeci/emscripten:sdk-latest bash;
export CMAKE_ARCH_ARGS='-DPLATFORM=Web -DCMAKE_TOOLCHAIN_FILE=../cmake/emscripten.cmake'; export CMAKE_ARCH_ARGS='-DPLATFORM=Web -DCMAKE_TOOLCHAIN_FILE=../cmake/emscripten.cmake';
RUNNER='docker exec -it emscripten cmake -E chdir build'; RUNNER='docker exec -it emscripten cmake -E chdir build';
else else