Update travis
This commit is contained in:
parent
aeee1419a2
commit
46a9d3fac6
2 changed files with 8 additions and 8 deletions
14
.travis.yml
14
.travis.yml
|
@ -21,21 +21,21 @@ before_install:
|
||||||
script:
|
script:
|
||||||
- sh gen-version.sh travis build
|
- sh gen-version.sh travis build
|
||||||
- python2 makepak.py xash-extras assets/extras.pak
|
- python2 makepak.py xash-extras assets/extras.pak
|
||||||
- ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard"
|
- ndk-build NDK_TOOLCHAIN_VERSION=4.8 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard"
|
||||||
- ant debug
|
- ant debug
|
||||||
- cp bin/xashdroid-debug.apk xashdroid-armv7.apk
|
- cp bin/xashdroid-debug.apk xashdroid-armv7.apk
|
||||||
- ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi"
|
- ndk-build NDK_TOOLCHAIN_VERSION=4.8 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi"
|
||||||
- ant debug
|
- ant debug
|
||||||
- cp bin/xashdroid-debug.apk xashdroid-armv6.apk
|
- cp bin/xashdroid-debug.apk xashdroid-armv6.apk
|
||||||
- ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="x86"
|
- ndk-build NDK_TOOLCHAIN_VERSION=4.8 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="x86"
|
||||||
- ant debug
|
- ant debug
|
||||||
- cp bin/xashdroid-debug.apk xashdroid-x86.apk
|
- cp bin/xashdroid-debug.apk xashdroid-x86.apk
|
||||||
- ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 clean
|
- ndk-build NDK_TOOLCHAIN_VERSION=4.8 clean
|
||||||
- ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard" CFLAGS_OPT_ARM="-mthumb -mfpu=vfpv3-d16 -mcpu=cortex-a9 -pipe -fPIC"
|
- ndk-build NDK_TOOLCHAIN_VERSION=4.8 -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard" CFLAGS_OPT_ARM="-mthumb -mfpu=vfpv3-d16 -mcpu=cortex-a9 -pipe -fPIC"
|
||||||
- ant debug
|
- ant debug
|
||||||
- cp bin/xashdroid-debug.apk xashdroid-armv7-tegra2.apk
|
- cp bin/xashdroid-debug.apk xashdroid-armv7-tegra2.apk
|
||||||
- ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 clean
|
- ndk-build NDK_TOOLCHAIN_VERSION=4.8 clean
|
||||||
- ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 -j2 APP_CFLAGS="-w" APP_ABI="armeabi" CFLAGS_OPT_ARMv5="-marm -march=armv5te -msoft-float -fPIC"
|
- ndk-build NDK_TOOLCHAIN_VERSION=4.8 -j2 APP_CFLAGS="-w" APP_ABI="armeabi" CFLAGS_OPT_ARMv5="-marm -march=armv5te -msoft-float -fPIC"
|
||||||
- ant debug
|
- ant debug
|
||||||
- cp bin/xashdroid-debug.apk xashdroid-armv5.apk
|
- cp bin/xashdroid-debug.apk xashdroid-armv5.apk
|
||||||
|
|
||||||
|
|
|
@ -90,7 +90,7 @@
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
<!-- Some devices with Android 2.2 should support native activity, it was in unstable hidden API -->
|
<!-- Some devices with Android 2.2 should support native activity, it was in unstable hidden API -->
|
||||||
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19" />
|
<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="19" />
|
||||||
|
|
||||||
<!-- OpenGL ES 1.1 -->
|
<!-- OpenGL ES 1.1 -->
|
||||||
<uses-feature android:glEsVersion="0x00010000" />
|
<uses-feature android:glEsVersion="0x00010000" />
|
||||||
|
|
Loading…
Add table
Reference in a new issue