From c1caaab3cea2152b65244d5379570a25264676f3 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Fri, 7 Mar 2014 13:45:16 +0300 Subject: [PATCH] [android] Added armeabi-v7a-hard ABI support to quake --- tools/mkspecs/android-g++/qmake.conf | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/mkspecs/android-g++/qmake.conf b/tools/mkspecs/android-g++/qmake.conf index b835a2cbba..01108ed167 100644 --- a/tools/mkspecs/android-g++/qmake.conf +++ b/tools/mkspecs/android-g++/qmake.conf @@ -53,7 +53,7 @@ ANDROID_SOURCES_CXX_STL_INCDIR = $$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/$$TO QMAKE_CC = $$NDK_TOOLCHAIN_PATH/bin/$$ANDROID_CC_PREFIX-gcc QMAKE_CFLAGS += --sysroot=$$ANDROID_PLATFORM_ROOT_PATH -ffunction-sections -fdata-sections -fomit-frame-pointer -DANDROID -Wno-psabi -#QMAKE_CFLAGS += -funwind-tables +QMAKE_CFLAGS += -funwind-tables QMAKE_CFLAGS_DEBUG += -fstack-protector -O0 -g # We have -g in release/production because android strips symbols automatically and leaves unstripped libs too to decode crash logs with ndk-stack QMAKE_CFLAGS_RELEASE *= -O3 -g @@ -63,11 +63,16 @@ contains(ANDROID_TARGET_ARCH, arm) { QMAKE_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 QMAKE_LFLAGS += -march=armv7-a -Wl,--fix-cortex-a8 } else { - QMAKE_CFLAGS += -march=armv5te -mtune=xscale -msoft-float + contains(ANDROID_TARGET_ABI, armeabi-v7a-hard) { + QMAKE_CFLAGS += -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -D_NDK_MATH_NO_SOFTFP=1 + QMAKE_LFLAGS += -march=armv7-a -Wl,--fix-cortex-a8 -Wl,--no-warn-mismatch -lm_hard + } else { + QMAKE_CFLAGS += -march=armv5te -mtune=xscale -msoft-float + } } } else { contains(ANDROID_TARGET_ARCH, mips) { - QMAKE_CFLAGS += -fpic -fno-strict-aliasing -finline-functions -funwind-tables -fmessage-length=0 -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers -Wno-psabi -fomit-frame-pointer -funswitch-loops -finline-limit=300 -Wa,--noexecstack + QMAKE_CFLAGS += -fpic -fno-strict-aliasing -finline-functions -fmessage-length=0 -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers -Wno-psabi -fomit-frame-pointer -funswitch-loops -finline-limit=300 -Wa,--noexecstack } else { # x86 options QMAKE_CFLAGS += -fstrict-aliasing -finline-limit=300 -funswitch-loops