diff --git a/Android.mk b/Android.mk
index 3f06098545dd4bfd50fd29e95c276a694e92ec4c..11fc7cd270cc5f91635579cb2f63148cdccf542b 100644 (file)
--- a/Android.mk
+++ b/Android.mk
LOCAL_MODULE := NanoGL
-LOCAL_CFLAGS := -O2
+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
+
+LOCAL_CFLAGS +=
LOCAL_C_INCLUDES := $(LOCAL_PATH)/GL
nanogl.cpp \
nanoWrap.cpp \
eglwrap.cpp
-
LOCAL_LDLIBS := -llog
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)