put back libpng stuff to Android.mk
authorOzkan Sezer <sezeroz@gmail.com>
Wed, 06 Nov 2019 10:01:02 +0300
changeset 7334f8739f006ad
parent 732 42b53e22b932
child 734 e23c797d0a84
put back libpng stuff to Android.mk
Android.mk
     1.1 --- a/Android.mk	Tue Nov 05 16:49:33 2019 -0500
     1.2 +++ b/Android.mk	Wed Nov 06 10:01:02 2019 +0300
     1.3 @@ -9,6 +9,7 @@
     1.4  # Enable this if you want to support loading PNG images
     1.5  # The library path should be a relative path to this directory.
     1.6  SUPPORT_PNG ?= true
     1.7 +PNG_LIBRARY_PATH := external/libpng-1.6.37
     1.8  
     1.9  # Enable this if you want to support loading WebP images
    1.10  # The library path should be a relative path to this directory.
    1.11 @@ -22,6 +23,11 @@
    1.12  endif
    1.13  
    1.14  # Build the library
    1.15 +ifeq ($(SUPPORT_PNG),true)
    1.16 +    include $(SDL_IMAGE_LOCAL_PATH)/$(PNG_LIBRARY_PATH)/Android.mk
    1.17 +endif
    1.18 +
    1.19 +# Build the library
    1.20  ifeq ($(SUPPORT_WEBP),true)
    1.21      include $(SDL_IMAGE_LOCAL_PATH)/$(WEBP_LIBRARY_PATH)/Android.mk
    1.22  endif
    1.23 @@ -66,7 +72,10 @@
    1.24  endif
    1.25  
    1.26  ifeq ($(SUPPORT_PNG),true)
    1.27 +    LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(PNG_LIBRARY_PATH)
    1.28      LOCAL_CFLAGS += -DLOAD_PNG
    1.29 +    LOCAL_STATIC_LIBRARIES += png
    1.30 +    LOCAL_LDLIBS += -lz
    1.31  endif
    1.32  
    1.33  ifeq ($(SUPPORT_WEBP),true)