diff --git a/.travis.yml b/.travis.yml index c4b41dce..0ce3feaa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -208,6 +208,31 @@ jobs: # - sh scripts/build_${TRAVIS_OS_NAME}_engine.sh # after_script: # - sh scripts/continious_upload.sh xash3d-osx.tar.bz2 + - # ... + name: "Build for Android arm softfp w/ polly" + sudo: true + cache: ccache + os: linux + dist: xenial + addons: + apt: + packages: + - libc6:i386 + - libstdc++6:i386 + - gcc-multilib + - g++-multilib + - p7zip-full + sources: + - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main' + key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' + before_script: + - sh scripts/travis_common_deps.sh + - sh scripts/travis_motomagx_deps.sh + script: + - sh scripts/build_motomagx_engine.sh + after_script: + - ccache --show-stats + - sh ../scripts/continious_upload.sh xash3d-magx.7z - # ... name: "Build for Windows MSVC" cache: ccache @@ -224,4 +249,4 @@ jobs: os: linux cache: false script: - - sh scripts/travis-deploy.sh xash3d-fwgs-i686.AppImage xash3d-fwgs-x86_64.AppImage xash3d-vc.7z xash3d-vc2008-sln.7z xashdroid.apk xashdroid-64-test.apk xashdroid-hardfp-test.apk xashdroid-softfp-test.apk xashds-linux-i686 xashds-linux-x86_64 + - sh scripts/travis-deploy.sh xash3d-fwgs-i686.AppImage xash3d-fwgs-x86_64.AppImage xash3d-vc.7z xash3d-vc2008-sln.7z xashdroid.apk xashdroid-64-test.apk xashdroid-hardfp-test.apk xashdroid-softfp-test.apk xashds-linux-i686 xashds-linux-x86_64 xash3d-magx.7z diff --git a/scripts/build_motomagx_engine.sh b/scripts/build_motomagx_engine.sh new file mode 100755 index 00000000..776a24df --- /dev/null +++ b/scripts/build_motomagx_engine.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +. scripts/lib.sh +. /opt/toolchains/motomagx/setenv-z6.sh + +cd $TRAVIS_BUILD_DIR + +mkdir -p Xash/valve/cl_dlls +mkdir -p Xash/valve/dlls + +cd hlsdk +./waf configure -T fast --enable-magx build +cp build/cl_dlls/client.so ../Xash/valve/cl_dlls/client_armv6l.so +cp build/dlls/hl.so ../Xash/valve/cl_dlls/hl_armv6l.so +cd ../ + +./waf configure -T fast --enable-magx --win-style-install --prefix='' build install --destdir=Xash/ \ + +7z a -t7z $TRAVIS_BUILD_DIR/xash3d-magx.7z -m0=lzma2 -mx=9 -mfb=64 -md=32m -ms=on -r Xash/ diff --git a/scripts/travis_motomagx_deps.sh b/scripts/travis_motomagx_deps.sh new file mode 100644 index 00000000..d39ee3ca --- /dev/null +++ b/scripts/travis_motomagx_deps.sh @@ -0,0 +1,6 @@ +sudo mkdir -p /opt/toolchains +cd /opt/toolchains/ +sudo git clone https://github.com/a1batross/motomagx_toolchain motomagx +cd $TRAVIS_BUILD_DIR + +git clone https://github.com/FWGS/hlsdk-xash3d hlsdk