From: mittorn Date: Wed, 26 Aug 2015 19:15:42 +0000 (+0700) Subject: Global config X-Git-Url: https://deadsoftware.ru/gitweb?p=nanogl.git;a=commitdiff_plain;h=33dcfcd8a05ed9cfed625549261ed7b732610139 Global config --- diff --git a/Android.mk b/Android.mk index 11fc7cd..70c5634 100644 --- a/Android.mk +++ b/Android.mk @@ -18,19 +18,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := NanoGL -LOCAL_CFLAGS += $(CFLAGS_OPT) -ifeq ($(TARGET_ARCH_ABI),armeabi-v7a-hard) -LOCAL_CFLAGS += $(CFLAGS_OPT_ARM) -mfloat-abi=hard -mhard-float -DLOAD_HARDFP -DSOFTFP_LINK -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 +include $(XASH3D_CONFIG) LOCAL_CFLAGS +=