vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Global config

Browse source
This commit is contained in:
mittorn 2015-08-27 01:46:46 +07:00
parent 29aec91121
commit d720e327c9
3 changed files with 17 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
jni/Android.mk
View file

@ -4,34 +4,6 @@ override TARGET_arm_release_CFLAGS :=
override TARGET_thumb_release_CFLAGS := override TARGET_thumb_release_CFLAGS :=
override TARGET_arm_debug_CFLAGS := override TARGET_arm_debug_CFLAGS :=
override TARGET_thumb_debug_CFLAGS := override TARGET_thumb_debug_CFLAGS :=
override TARGET_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 :=
include $(call all-subdir-makefiles) include $(call all-subdir-makefiles)

4
jni/Application.mk
View file

@ -37,7 +37,9 @@ XASHXT_PATH := $(APPLICATIONMK_PATH)/src/XashXT/XashXT
HLSDK_PATH := $(APPLICATIONMK_PATH)/src/HLSDK/halflife/ 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 # 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 # 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 # Mods are built with both ABI support

13
jni/xash3d_config.mk Normal file
View file

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