put back libpng stuff to Android.mk

libsdl-org · Nov 6, 2019 · 8d5a721 · 8d5a721
1 parent c5e4e65
commit 8d5a721
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/Android.mk b/Android.mk
@@ -9,6 +9,7 @@ JPG_LIBRARY_PATH := external/jpeg-9b
 # Enable this if you want to support loading PNG images
 # The library path should be a relative path to this directory.
 SUPPORT_PNG ?= true
+PNG_LIBRARY_PATH := external/libpng-1.6.37
 
 # Enable this if you want to support loading WebP images
 # The library path should be a relative path to this directory.
@@ -21,6 +22,11 @@ ifeq ($(SUPPORT_JPG),true)
     include $(SDL_IMAGE_LOCAL_PATH)/$(JPG_LIBRARY_PATH)/Android.mk
 endif
 
+# Build the library
+ifeq ($(SUPPORT_PNG),true)
+    include $(SDL_IMAGE_LOCAL_PATH)/$(PNG_LIBRARY_PATH)/Android.mk
+endif
+
 # Build the library
 ifeq ($(SUPPORT_WEBP),true)
     include $(SDL_IMAGE_LOCAL_PATH)/$(WEBP_LIBRARY_PATH)/Android.mk
@@ -66,7 +72,10 @@ ifeq ($(SUPPORT_JPG),true)
 endif
 
 ifeq ($(SUPPORT_PNG),true)
+    LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(PNG_LIBRARY_PATH)
     LOCAL_CFLAGS += -DLOAD_PNG
+    LOCAL_STATIC_LIBRARIES += png
+    LOCAL_LDLIBS += -lz
 endif
 
 ifeq ($(SUPPORT_WEBP),true)