diff options
| author | huangqinjin <huangqinjin@gmail.com> | 2020-05-14 01:25:33 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-13 10:25:33 -0700 |
| commit | 597038559647776ee39d02dcf159da05d9342f1d (patch) | |
| tree | cd5afb690b1cc4d155ac1efcf383ad8bdaa9200f | |
| parent | 6fd7e9c7120c2faf6846e315ac8073dd04367059 (diff) | |
| download | vcpkg-597038559647776ee39d02dcf159da05d9342f1d.tar.gz vcpkg-597038559647776ee39d02dcf159da05d9342f1d.zip | |
[libpng] Fix android build (#11280)
| -rw-r--r-- | ports/libpng/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libpng/portfile.cmake | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ports/libpng/CONTROL b/ports/libpng/CONTROL index 309a6dfc0..0258a720e 100644 --- a/ports/libpng/CONTROL +++ b/ports/libpng/CONTROL @@ -1,5 +1,5 @@ Source: libpng -Version: 1.6.37-8 +Version: 1.6.37-9 Build-Depends: zlib Homepage: https://github.com/glennrp/libpng Description: libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files. diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake index af2ab012c..28fee46f3 100644 --- a/ports/libpng/portfile.cmake +++ b/ports/libpng/portfile.cmake @@ -53,12 +53,18 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL iOS) set(LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_HARDWARE_OPTIMIZATIONS=OFF") endif() +set(LD_VERSION_SCRIPT_OPTION ) +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL Android) + set(LD_VERSION_SCRIPT_OPTION "-Dld-version-script=OFF") +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS ${LIBPNG_APNG_OPTION} ${LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION} + ${LD_VERSION_SCRIPT_OPTION} -DPNG_ARM_NEON=on -DPNG_STATIC=${PNG_STATIC_LIBS} -DPNG_SHARED=${PNG_SHARED_LIBS} |