Browse Source

properly use dynamic linking for LGPL libraries

fysx 12 years ago
parent
commit
e4e1a0f59b

+ 1 - 1
jni/Application.mk

@@ -4,6 +4,6 @@
 APP_STL := gnustl_shared
 APP_ABI := armeabi armeabi-v7a
 APP_CPPFLAGS := -frtti
-APP_LDFLAGS := -llog -landroid -lz -lOpenSLES
+APP_LDFLAGS := -llog -landroid -lz
 
 # APP_OPTIM := debug

+ 3 - 1
jni/devil-1.7.8/Android.mk

@@ -25,7 +25,9 @@ LOCAL_SRC_FILES := \
 	$(wildcard ${LOCAL_PATH}/src-IL/src/*.cpp) \
   $(wildcard ${LOCAL_PATH}/src-IL/src/*.c) ))
 
+LOCAL_SHARED_LIBRARIES := libtiff libpng libjasper libjpeg libmng liblcms
+
 # $(info libdevil: include dirs $(LOCAL_C_INCLUDES))
 # $(info libdevil: src files $(LOCAL_SRC_FILES))
 
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_SHARED_LIBRARY)

+ 1 - 1
jni/mpg123-1.17.0/Android.mk

@@ -25,4 +25,4 @@ LOCAL_SRC_FILES := \
 # $(info libmpg123: include dirs $(LOCAL_C_INCLUDES))
 # $(info libmpg123: src files $(LOCAL_SRC_FILES))
 
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_SHARED_LIBRARY)

+ 3 - 3
jni/openal-soft-android/Android.mk

@@ -16,6 +16,7 @@ LOCAL_C_INCLUDES  :=  \
 LOCAL_SRC_FILES := \
 	$(filter-out \
 	 Alc/mixer_neon.c \
+	 Alc/mixer_inc.c \
 	 Alc/mixer_sse.c \
 	, $(subst $(LOCAL_PATH)/,,\
 		${LOCAL_PATH}/Alc/backends/base.c \
@@ -29,7 +30,6 @@ LOCAL_SRC_FILES := \
 		$(wildcard ${LOCAL_PATH}/OpenAL32/*.c) \
 	))
 
-# $(info libopenal: include dirs $(LOCAL_C_INCLUDES))
-# $(info libopenal: src files $(LOCAL_SRC_FILES))
+LOCAL_LDLIBS := -lOpenSLES
 
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_SHARED_LIBRARY)