From 87bb39a074632931e62e3c524fd2acf8b98434fc Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Wed, 16 Mar 2016 18:29:47 +0200 Subject: [PATCH] SDL: NDK r11: more fixes to setEnvironemnt build scripts --- project/jni/application/openarena/engine | 2 +- project/jni/application/openarena/vm | 2 +- project/jni/application/setEnvironment-armeabi-v7a-hard.sh | 2 -- project/jni/application/setEnvironment-armeabi-v7a.sh | 2 -- project/jni/application/setEnvironment-mips.sh | 2 -- project/jni/application/setEnvironment-x86.sh | 2 -- project/jni/application/setEnvironment.sh | 2 -- 7 files changed, 2 insertions(+), 12 deletions(-) diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine index a6c6f13f9..f19d8ca37 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit a6c6f13f936bce7fc710253e7482f4357f9b23d7 +Subproject commit f19d8ca37da75cfb44105d035bafb712e1c40354 diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm index 7d7214e76..601fb2c76 160000 --- a/project/jni/application/openarena/vm +++ b/project/jni/application/openarena/vm @@ -1 +1 @@ -Subproject commit 7d7214e76a08d870499823226921bac5d88f19c9 +Subproject commit 601fb2c762db37009892833cb36aee7a926aac0b diff --git a/project/jni/application/setEnvironment-armeabi-v7a-hard.sh b/project/jni/application/setEnvironment-armeabi-v7a-hard.sh index 237db8586..5c4601b3f 100755 --- a/project/jni/application/setEnvironment-armeabi-v7a-hard.sh +++ b/project/jni/application/setEnvironment-armeabi-v7a-hard.sh @@ -18,8 +18,6 @@ NDK=`which ndk-build` NDK=`dirname $NDK` NDK=`readlink -f $NDK` -grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64" - #echo NDK $NDK GCCPREFIX=arm-linux-androideabi [ -z "$NDK_TOOLCHAIN_VERSION" ] && NDK_TOOLCHAIN_VERSION=4.9 diff --git a/project/jni/application/setEnvironment-armeabi-v7a.sh b/project/jni/application/setEnvironment-armeabi-v7a.sh index 1dddc6e4e..d86237743 100755 --- a/project/jni/application/setEnvironment-armeabi-v7a.sh +++ b/project/jni/application/setEnvironment-armeabi-v7a.sh @@ -18,8 +18,6 @@ NDK=`which ndk-build` NDK=`dirname $NDK` NDK=`readlink -f $NDK` -grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64" - #echo NDK $NDK GCCPREFIX=arm-linux-androideabi [ -z "$NDK_TOOLCHAIN_VERSION" ] && NDK_TOOLCHAIN_VERSION=4.9 diff --git a/project/jni/application/setEnvironment-mips.sh b/project/jni/application/setEnvironment-mips.sh index 287d82d14..27d85e13e 100755 --- a/project/jni/application/setEnvironment-mips.sh +++ b/project/jni/application/setEnvironment-mips.sh @@ -18,8 +18,6 @@ NDK=`which ndk-build` NDK=`dirname $NDK` NDK=`readlink -f $NDK` -grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64" - #echo NDK $NDK GCCPREFIX=mipsel-linux-android [ -z "$NDK_TOOLCHAIN_VERSION" ] && NDK_TOOLCHAIN_VERSION=4.9 diff --git a/project/jni/application/setEnvironment-x86.sh b/project/jni/application/setEnvironment-x86.sh index e6862409c..f9a9fa91e 100755 --- a/project/jni/application/setEnvironment-x86.sh +++ b/project/jni/application/setEnvironment-x86.sh @@ -18,8 +18,6 @@ NDK=`which ndk-build` NDK=`dirname $NDK` NDK=`readlink -f $NDK` -grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64" - #echo NDK $NDK GCCPREFIX=i686-linux-android [ -z "$NDK_TOOLCHAIN_VERSION" ] && NDK_TOOLCHAIN_VERSION=4.9 diff --git a/project/jni/application/setEnvironment.sh b/project/jni/application/setEnvironment.sh index f4976d1ee..8b51f02c5 100755 --- a/project/jni/application/setEnvironment.sh +++ b/project/jni/application/setEnvironment.sh @@ -18,8 +18,6 @@ NDK=`which ndk-build` NDK=`dirname $NDK` NDK=`readlink -f $NDK` -grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64" - #echo NDK $NDK GCCPREFIX=arm-linux-androideabi [ -z "$NDK_TOOLCHAIN_VERSION" ] && NDK_TOOLCHAIN_VERSION=4.9