diff --git a/configure-android b/configure-android index 9a5872194..5fdab3f5c 100755 --- a/configure-android +++ b/configure-android @@ -21,9 +21,8 @@ if test "$*" = "--help" -o "$*" = "-h"; then echo " android-9. By default, configure will use the" echo " maximum platform level detected." echo " TARGET_ABI Optionally specify a single target architecture," - echo " e.g. armeabi-v7a, mips, x86. By default, the target" - echo " architecture is armeabi. Only used when" - echo " --use-ndk-cflags is specified." + echo " e.g. armeabi-v7a, arm64-v8a, mips, x86. By default, " + echo " the target architecture is arm64-v8a." echo " IGNORE_CFLAGS Optionally specify compilation flags to be ignored." echo " Each grepped flag that satisfies the criteria will" echo " be ignored. Default:" @@ -49,12 +48,7 @@ if test "x$APP_PLATFORM" = "x"; then fi if test "x$TARGET_ABI" = "x"; then - # armeabi was removed since NDK r17 - if [ "${NDK_VER}" -ge "17" ]; then - TARGET_ABI="armeabi-v7a" - else - TARGET_ABI="armeabi" - fi + TARGET_ABI="arm64-v8a" echo "$F: TARGET_ABI not specified, using ${TARGET_ABI}" fi diff --git a/configure-iphone b/configure-iphone index 9e93c8e2b..ae0d38524 100755 --- a/configure-iphone +++ b/configure-iphone @@ -18,7 +18,7 @@ if test "$*" = "--help" -o "$*" = "-h"; then echo " to use. By default, the compiler is deduced from the" echo " SDK." echo " ARCH Optional flags to specify target architecture, e.g." - echo " ARCH=\"-arch armv6\". Default is armv7." + echo " ARCH=\"-arch armv7\". Default is arm64." echo " MIN_IOS Optional flags to specify minimum supported iOS" echo " versions, e.g. MIN_IOS=\"-miphoneos-version-min=10.0\". " echo " Default is 7.0." @@ -113,7 +113,7 @@ if test "${CC}" = ""; then fi if test "${ARCH}" = ""; then - export ARCH="-arch armv7" + export ARCH="-arch arm64" echo "$F: ARCH is not specified, choosing ${ARCH}" fi export ARCH_VAL=`echo ${ARCH} | sed 's/\-arch //' | sed -e 's/^[ \t]*//;s/[ \t]*$//' `