From f950e3192f8df1e1b526dd2c7056923aa0065a66 Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Sun, 28 Jul 2024 12:33:26 -0500
Subject: [PATCH] updated build system

---
 cmake/versions.cmake  |  5 +++--
 docker/x86_64/mingw64 | 22 ++++++++++++++++++++++
 scripts/env.sh        |  1 +
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/cmake/versions.cmake b/cmake/versions.cmake
index cb9b46c9..8e98987a 100644
--- a/cmake/versions.cmake
+++ b/cmake/versions.cmake
@@ -22,11 +22,12 @@ set(ICU_VERSION 75-1)
 set(JSON_VERSION 3.11.3)
 set(LIBBITCOIN_SYSTEM_VERSION 3.8.0)
 set(LIBEVENT_VERSION 2.1.12)
+set(LIBJPEG_TURBO_VERSION 3.0.3)
+set(LIBPNG_VERSION 1.6.43)
 set(LIBSODIUM_VERSION 1.0.20)
 set(MESA_VERSION 23.3.3)
 set(MINGW_VERSION 11.0.1)
 set(NANA_VERSION 1.7.4)
-set(LIBJPEG_TURBO_VERSION 3.0.3)
 set(NUSPELL_VERSION 5.1.4)
 set(OGG_VERSION 1.3.5)
 set(OPENAL_VERSION 1.23.1)
@@ -34,8 +35,8 @@ set(OPENSSL_VERSION 3.3.1)
 set(PKG_CONFIG_VERSION 0.29.2)
 set(PUGIXML_VERSION 1.14)
 set(ROCKSDB_VERSION 9.4.0)
-set(SECP256K1_VERSION 0.1.0.20)
 set(SDL_VERSION 2.30.5)
+set(SECP256K1_VERSION 0.1.0.20)
 set(SFML_VERSION 2.6.1)
 set(SPDLOG_VERSION 1.14.1)
 set(SQLITE_VERSION 3460000)
diff --git a/docker/x86_64/mingw64 b/docker/x86_64/mingw64
index a1432ec1..7339958a 100644
--- a/docker/x86_64/mingw64
+++ b/docker/x86_64/mingw64
@@ -269,6 +269,28 @@ RUN if [ -f "/3rd_party/libjpeg_turbo-${MY_LIBJPEG_TURBO_VERSION}.tar.gz" ]; the
       && rm -r libjpeg-turbo-${MY_LIBJPEG_TURBO_VERSION} \
     ; fi
 
+ARG LIBPNG_VERSION
+ENV MY_LIBPNG_VERSION=${LIBPNG_VERSION}
+RUN if [ -f "/3rd_party/libpng-v${MY_LIBPNG_VERSION}.tar.gz" ]; then \
+      tar xvzf /3rd_party/libpng-v${MY_LIBPNG_VERSION}.tar.gz \
+      && cd libpng-${MY_LIBPNG_VERSION} \
+      && mkdir _build \
+      && cd _build \
+      && cmake .. -DCMAKE_TOOLCHAIN_FILE=${MY_TOOLCHAIN_FILE_CMAKE} \
+        -DBUILD_SHARED_LIBS=ON \
+        -DBUILD_STATIC_LIBS=ON \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=${MY_MINGW_DIR} \
+        -DPNG_SHARED=ON \
+        -DPNG_STATIC=ON \
+        -DPNG_TESTS=OFF \
+        -DPNG_TOOLS=OFF \
+      && make -j${MY_NUM_JOBS} \
+      && make install \
+      && cd ${MY_WORKDIR} \
+      && rm -r libpng-${MY_LIBPNG_VERSION} \
+    ; fi
+
 ARG FREETYPE2_VERSION
 ENV MY_FREETYPE2_VERSION=${FREETYPE2_VERSION}
 RUN if [ -f "/3rd_party/freetype-${MY_FREETYPE2_VERSION}.tar.gz" ]; then \
diff --git a/scripts/env.sh b/scripts/env.sh
index 2c1ed782..dfdb49ed 100755
--- a/scripts/env.sh
+++ b/scripts/env.sh
@@ -112,6 +112,7 @@ fi
 
 if [ "${PROJECT_ENABLE_NANA}" == "ON" ]; then
   PROJECT_ENABLE_LIBJPEG_TURBO=ON
+  PROJECT_ENABLE_LIBPNG=ON
 fi
 
 PROJECT_IS_ARM64=0