Fix typo in nanoGL_GetProcAddress, return 1 in nanoGL_Init() if wrapper already initi...

[nanogl.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index e7654fcf4e20e0aa3c4c1f1b1db4da1364afd050..892b5b116b76e9eeff7e80ab7dad64db65802a54 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -19,14 +19,20 @@ 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
 
-LOCAL_CFLAGS +=
+#LOCAL_CFLAGS += -D__MULTITEXTURE_SUPPORT__
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/GL
 
@@ -37,5 +43,5 @@ LOCAL_SRC_FILES := \
 
 LOCAL_LDLIBS := -llog
 
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_SHARED_LIBRARY)