mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Added armeabi-v7a-hard ABI support to quake

Browse source
This commit is contained in:
Alex Zolotarev 2014-03-07 13:45:16 +03:00 • committed by Alex Zolotarev
parent bd94322d6c
commit c1caaab3ce
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tools/mkspecs/android-g++/qmake.conf
View file

@ -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