From 545f14a8b62d35401dfb80816b6a42ad02e8f47c Mon Sep 17 00:00:00 2001 From: mittorn Date: Wed, 12 Aug 2015 23:07:07 +0700 Subject: [PATCH] Update Application.mk --- jni/Application.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/jni/Application.mk b/jni/Application.mk index fd0827e1..0ddc4f1c 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -12,8 +12,9 @@ APP_PLATFORM := android-8 endif -CFLAGS_OPT := -O3 -fomit-frame-pointer -ggdb -funsafe-math-optimizations -ftree-vectorize -fgraphite-identity -floop-interchange -funsafe-loop-optimizations -finline-limit=1024 -DXASH3D_ANDROID_TEST -CFLAGS_OPT_ARM := -mthumb -mfloat-abi=hard -mhard-float -mfpu=neon -mcpu=cortex-a9 -pipe -mvectorize-with-neon-quad -DVECTORIZE_SINCOS -DSOFTFP_LINK +CFLAGS_OPT := -O3 -fomit-frame-pointer -ggdb -funsafe-math-optimizations -ftree-vectorize -fgraphite-identity -floop-interchange -funsafe-loop-optimizations -finline-limit=1024 +CFLAGS_OPT_ARM := -mthumb -mfpu=neon -mcpu=cortex-a9 -pipe -mvectorize-with-neon-quad -DVECTORIZE_SINCOS +CFLAGS_OPT_ARMv5 := -msoft-float -marm -pipe CFLAGS_OPT_X86 := -mtune=atom -march=atom -mssse3 -mfpmath=sse -funroll-loops -pipe -DVECTORIZE_SINCOS APPLICATIONMK_PATH = $(call my-dir) @@ -37,6 +38,12 @@ XASHXT_PATH := $(APPLICATIONMK_PATH)/src/XashXT/XashXT HLSDK_PATH := $(APPLICATIONMK_PATH)/src/HLSDK/halflife/ APP_ABI := x86 armeabi-v7a-hard +# Use armeabi-v7a to disable hardfloat, armeabi to build armv5 xash3d +# Change CFLAGS_OPT_ARMv5 to "-mfloat-abi=softfp -mfpu=vfp" and fix setup.mk of ndk to build armv6 +# Mods are built with both ABI support +# ARMv6 and ARMv5 xash3d builds use softfp only and compatible only with softfp mods +# Build both armeabi-v7a-hard and armeabi-v7a supported only for mods, not for engine + APP_MODULES := xash menu client server NanoGL ifeq ($(XASH_SDL),1) APP_MODULES += SDL2