From eb7543d139aec1412484fc8b2f7eb6ba2efb45a5 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Fri, 14 Nov 2014 15:14:53 +0000 Subject: [PATCH] Enables ARMv7 build options entirely on ARM. We only support ARMv7 with Dolphin, so if we are building on ARM have our target be for armv7-a. --- CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 87a90d3410..96c326166f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,9 +153,7 @@ if(NOT ENABLE_GENERIC) set(_M_ARM 1) set(_M_ARM_32 1) add_definitions(-D_M_ARM=1 -D_M_ARM_32=1) - if(${ANDROID_NDK_ABI_NAME} MATCHES "armeabi-v7a") - add_definitions(-marm -march=armv7-a) - endif() + add_definitions(-marm -march=armv7-a) elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") # This option only applies to 64bit ARM set(_M_ARM 1)