From c0f02a8078214484e68f706bb8888241939663df Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 8 Sep 2017 12:26:18 -0500 Subject: [PATCH] [libpng16] Use pnglibconf.h.prebuilt when building for ANDROID with cmake Github issue 162, by rcdaily). --- ANNOUNCE | 6 ++++-- CHANGES | 4 +++- CMakeLists.txt | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 5b174e3c1..e3adea876 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.33beta03 - September 3, 2017 +Libpng 1.6.33beta03 - September 8, 2017 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -39,10 +39,12 @@ Version 1.6.33beta02 [September 3, 2017] changed date of contrib/oss-fuzz files. Enabled ARM support in CMakeLists.txt (Bernd Kuhls). -Version 1.6.33beta03 [September 3, 2017] +Version 1.6.33beta03 [September 8, 2017] Fixed incorrect typecast of some arguments to png_malloc() and png_calloc() that were png_uint_32 instead of png_alloc_size_t (Bug report by "irwir" in Github libpng issue #175). + Use pnglibconf.h.prebuilt when building for ANDROID with cmake (Github + issue 162, by rcdaily). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 854512ce1..e2c0dea99 100644 --- a/CHANGES +++ b/CHANGES @@ -6009,10 +6009,12 @@ Version 1.6.33beta02 [September 3, 2017] changed date of contrib/oss-fuzz files. Enabled ARM support in CMakeLists.txt (Bernd Kuhls). -Version 1.6.33beta03 [September 3, 2017] +Version 1.6.33beta03 [September 8, 2017] Fixed incorrect typecast of some arguments to png_malloc() and png_calloc() that were png_uint_32 instead of png_alloc_size_t (Bug report by "irwir" in Github libpng issue #175). + Use pnglibconf.h.prebuilt when building for ANDROID with cmake (Github + issue 162, by rcdaily). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index 98ce9b552..9d2facfb3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -262,7 +262,7 @@ find_program(AWK NAMES gawk awk) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -if(NOT AWK) +if(NOT AWK OR ANDROID) # No awk available to generate sources; use pre-built pnglibconf.h configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h)