From d720e327c9956eb2b14882d81699f7209ac1d6e3 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Thu, 27 Aug 2015 01:46:46 +0700
Subject: [PATCH] Global config

---
 jni/Android.mk       | 30 +-----------------------------
 jni/Application.mk   |  4 +++-
 jni/xash3d_config.mk | 13 +++++++++++++
 3 files changed, 17 insertions(+), 30 deletions(-)
 create mode 100644 jni/xash3d_config.mk

diff --git a/jni/Android.mk b/jni/Android.mk
index 6cc12757..4396ffa9 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -4,34 +4,6 @@ override TARGET_arm_release_CFLAGS :=
 override TARGET_thumb_release_CFLAGS :=
 override TARGET_arm_debug_CFLAGS :=
 override TARGET_thumb_debug_CFLAGS :=
-
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a-hard)
-override TARGET_CFLAGS := $(CFLAGS_OPT) $(CFLAGS_OPT_ARM) $(CFLAGS_HARDFP)
-endif
-
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-override TARGET_CFLAGS := $(CFLAGS_OPT) $(CFLAGS_OPT_ARM)
-endif
-
-ifeq ($(TARGET_ARCH_ABI),armeabi)
-override TARGET_CFLAGS := $(CFLAGS_OPT) $(CFLAGS_OPT_ARMv5)
-endif
-
-ifeq ($(TARGET_ARCH_ABI),x86)
-override TARGET_CFLAGS := $(CFLAGS_OPT) $(CFLAGS_OPT_X86)
-endif
-
-# Compatibility trick, don't need all projects to be updated
-
-CFLAGS_OPT := 
-
-CFLAGS_OPT_ARM := 
-
-CFLAGS_OPT_ARMv5 := 
-
-CFLAGS_OPT_X86 := 
-
-CFLAGS_HARDFP := 
-
+override TARGET_CFLAGS :=
 
 include $(call all-subdir-makefiles)
diff --git a/jni/Application.mk b/jni/Application.mk
index 53532d3c..27f13f28 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -37,7 +37,9 @@ XASHXT_PATH := $(APPLICATIONMK_PATH)/src/XashXT/XashXT
 
 HLSDK_PATH  := $(APPLICATIONMK_PATH)/src/HLSDK/halflife/
 
-APP_ABI := x86 armeabi-v7a-hard
+XASH3D_CONFIG := $(APPLICATIONMK_PATH)/xash3d_config.mk
+
+APP_ABI := x86 armeabi 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
diff --git a/jni/xash3d_config.mk b/jni/xash3d_config.mk
new file mode 100644
index 00000000..d569969c
--- /dev/null
+++ b/jni/xash3d_config.mk
@@ -0,0 +1,13 @@
+LOCAL_CFLAGS += $(CFLAGS_OPT)
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a-hard)
+LOCAL_CFLAGS += $(CFLAGS_OPT_ARM) $(CFLAGS_HARDFP)
+endif
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+LOCAL_CFLAGS += $(CFLAGS_OPT_ARM) -mfloat-abi=softfp
+endif
+ifeq ($(TARGET_ARCH_ABI),armeabi)
+LOCAL_CFLAGS += $(CFLAGS_OPT_ARMv5)
+endif
+ifeq ($(TARGET_ARCH_ABI),x86)
+LOCAL_CFLAGS += $(CFLAGS_OPT_X86)
+endif