Merge pull request #3 from mittorn/master

Global config

diff --git a/Android.mk b/Android.mk
index 11fc7cd270cc5f91635579cb2f63148cdccf542b..70c563406f9e9769b2fea70adefc69c82bf44e4f 100644 (file)
--- 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 +=