diff --git a/jme3-android-native/src/native/jme_stbi/Android.mk b/jme3-android-native/src/native/jme_stbi/Android.mk index ba8a4e64e..469c63e4d 100644 --- a/jme3-android-native/src/native/jme_stbi/Android.mk +++ b/jme3-android-native/src/native/jme_stbi/Android.mk @@ -1,13 +1,15 @@ +TARGET_PLATFORM := android-9 + LOCAL_PATH := $(call my-dir) + include $(CLEAR_VARS) LOCAL_MODULE := stbijme -LOCAL_C_INCLUDES := $(LOCAL_PATH) -LOCAL_CFLAGS += -O2 -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) -LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,, $(wildcard $(LOCAL_PATH)/*.c)) - -#adds zlib -LOCAL_LDLIBS += -lz -llog + +LOCAL_C_INCLUDES += $(LOCAL_PATH) + +LOCAL_LDLIBS := -lz -llog -Wl,-s + +LOCAL_SRC_FILES := com_jme3_texture_plugins_AndroidNativeImageLoader.c include $(BUILD_SHARED_LIBRARY) diff --git a/jme3-android-native/src/native/jme_stbi/Application.mk b/jme3-android-native/src/native/jme_stbi/Application.mk index fcdc69644..fbc028f84 100644 --- a/jme3-android-native/src/native/jme_stbi/Application.mk +++ b/jme3-android-native/src/native/jme_stbi/Application.mk @@ -1,3 +1,3 @@ +APP_PLATFORM := android-9 APP_OPTIM := release -APP_ABI := all -#APP_ABI := armeabi-v7a +APP_ABI := all \ No newline at end of file diff --git a/jme3-android-native/src/native/jme_stbi/com_jme3_texture_plugins_AndroidNativeImageLoader.c b/jme3-android-native/src/native/jme_stbi/com_jme3_texture_plugins_AndroidNativeImageLoader.c index 45dbed0b0..a4064a622 100644 --- a/jme3-android-native/src/native/jme_stbi/com_jme3_texture_plugins_AndroidNativeImageLoader.c +++ b/jme3-android-native/src/native/jme_stbi/com_jme3_texture_plugins_AndroidNativeImageLoader.c @@ -6,8 +6,9 @@ #include #include #include -#define STBI_HEADER_FILE_ONLY -#include "stb_image.c" + +#define STB_IMAGE_IMPLEMENTATION +#include "stb_image.h" typedef unsigned int uint32;