From 76fddc0729ea2024f5ecfbbcdafb6ebb372b2b72 Mon Sep 17 00:00:00 2001 From: Jonathan De Wachter Date: Tue, 11 Mar 2014 21:28:24 +0100 Subject: [PATCH] [Android] The armeabi version of SFML is now built by default (the example as well) --- cmake/toolchains/android.toolchain.cmake | 2 +- examples/android/jni/Application.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/toolchains/android.toolchain.cmake b/cmake/toolchains/android.toolchain.cmake index 5c306c3c1..7aac9374f 100644 --- a/cmake/toolchains/android.toolchain.cmake +++ b/cmake/toolchains/android.toolchain.cmake @@ -231,7 +231,7 @@ if(NOT DEFINED ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH) set( ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH /opt/android-toolchain ) endif() -set( ANDROID_SUPPORTED_ABIS_arm "armeabi-v7a;armeabi;armeabi-v7a with NEON;armeabi-v7a with VFPV3;armeabi-v6 with VFP" ) +set( ANDROID_SUPPORTED_ABIS_arm "armeabi;armeabi-v7a;armeabi-v7a with NEON;armeabi-v7a with VFPV3;armeabi-v6 with VFP" ) set( ANDROID_SUPPORTED_ABIS_x86 "x86" ) set( ANDROID_SUPPORTED_ABIS_mipsel "mips" ) diff --git a/examples/android/jni/Application.mk b/examples/android/jni/Application.mk index 360d526a8..17e41de28 100644 --- a/examples/android/jni/Application.mk +++ b/examples/android/jni/Application.mk @@ -1,5 +1,5 @@ NDK_TOOLCHAIN_VERSION := 4.8 APP_PLATFORM := android-17 APP_STL := c++_shared -APP_ABI := all +APP_ABI := armeabi APP_MODULES := sfml-activity sfml-example