From: mittorn <mittorn@sibmail.com>
Date: Wed, 12 Aug 2015 16:15:08 +0000 (+0700)
Subject: Merge branch 'hardfloat' of https://github.com/SDLash3D/nanogl into hardfloat
X-Git-Url: https://deadsoftware.ru/gitweb?p=nanogl.git;a=commitdiff_plain;h=82d270fc88aa4d6b0b07a6f55a0feaecebe98ebe;hp=25f16030860ed8f146f7f9e1bbffd7e7c8e9f050

Merge branch 'hardfloat' of https://github.com/SDLash3D/nanogl into hardfloat
---

diff --git a/Android.mk b/Android.mk
index e7654fc..11fc7cd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,10 +19,16 @@ include $(CLEAR_VARS)
 LOCAL_MODULE    := NanoGL
 
 LOCAL_CFLAGS += $(CFLAGS_OPT)
-ifeq ($(TARGET_ARCH),arm)
-LOCAL_CFLAGS += $(CFLAGS_OPT_ARM)
+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),x86)
+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