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 ff7c50e30dfe86a45c9549fa8d43fe12c1205939..892b5b116b76e9eeff7e80ab7dad64db65802a54 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -18,14 +18,30 @@ include $(CLEAR_VARS)
 
 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 += -D__MULTITEXTURE_SUPPORT__
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/GL
 
 LOCAL_SRC_FILES := \
        nanogl.cpp \
-       nanoWrap.cpp
-  
+       nanoWrap.cpp \
+       eglwrap.cpp
+
+LOCAL_LDLIBS := -llog
 
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_SHARED_LIBRARY)