Merge pull request #4 from AlchemyViewer/rye/winsym

Fix embedded debug symbols on windows

Author: RyeMutt

autobuild.xml

@@ -16,11 +16,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>db512fb9036db60e702990bc652487197a0e6c1542de6d35163368f07e8f5d0c21f74071c2c2d3b70ee10f28b2e4717dd340196d7656e1fd515f7a4a07bfc6d9</string>
+              <string>ea8354aedf732fab3ae7e2931d493175c78f426657d465356b1d04ca75eee2e47dc5fca8910b6d2093819e8bfffab661a63803bee9eaabd1401860bf47b5c0fd</string>
               <key>hash_algorithm</key>
               <string>blake2b</string>
               <key>url</key>
-              <string>https://github.com/AlchemyViewer/3p-zlib-ng/releases/download/v2.2.4-r2/zlib_ng-2.2.4.13482737442-darwin64-13482737442.tar.zst</string>
+              <string>https://github.com/AlchemyViewer/3p-zlib-ng/releases/download/v2.2.4-r3/zlib_ng-2.2.4.13485424982-darwin64-13485424982.tar.zst</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -30,11 +30,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>7062d4f650e7cca63061d3d5675cc17615adfe5e0b6dd7acdf203e48650bda62af8a741e51bac7bb0725476652f68cf28fa958a87f18e75a78ad3eb7a3df8c27</string>
+              <string>c123a43db118c5b44b99e299a98aa29f0d58edb3f5b874d6877770d0a95f53b99201cf03746381b9d506fcea2701f8a029854a3d30f4a4614e182e9ef88f0ff0</string>
               <key>hash_algorithm</key>
               <string>blake2b</string>
               <key>url</key>
-              <string>https://github.com/AlchemyViewer/3p-zlib-ng/releases/download/v2.2.4-r2/zlib_ng-2.2.4.13482737442-linux64-13482737442.tar.zst</string>
+              <string>https://github.com/AlchemyViewer/3p-zlib-ng/releases/download/v2.2.4-r3/zlib_ng-2.2.4.13485424982-linux64-13485424982.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -44,11 +44,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>4984b3df1bc9bbce36a5be9ef7410d2387c81653e99beec57785a0961acfca2ebbbbfef9acbbcaae7f2f7a6c1ae708d99cd8d7b2d6aa71d79900694d809b4aba</string>
+              <string>52c2e385869d2ae4189eec525dc3980756a3d0acc74cae5754bf5c6441766a2c40b3b1fe25146ded8754581c3ad22638df52db67ff530f49d9160351ada3986c</string>
               <key>hash_algorithm</key>
               <string>blake2b</string>
               <key>url</key>
-              <string>https://github.com/AlchemyViewer/3p-zlib-ng/releases/download/v2.2.4-r2/zlib_ng-2.2.4.13482737442-windows64-13482737442.tar.zst</string>
+              <string>https://github.com/AlchemyViewer/3p-zlib-ng/releases/download/v2.2.4-r3/zlib_ng-2.2.4.13485424982-windows64-13485424982.tar.zst</string>
             </map>
             <key>name</key>
             <string>windows64</string>
@@ -61,7 +61,7 @@
         <key>copyright</key>
         <string>Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler</string>
         <key>version</key>
-        <string>2.2.4.13482737442</string>
+        <string>2.2.4.13485424982</string>
         <key>name</key>
         <string>zlib-ng</string>
         <key>canonical_repo</key>

build-cmd.sh

@@ -30,9 +30,11 @@ source_environment_tempfile="$stage/source_environment.sh"
 "$autobuild" source_environment > "$source_environment_tempfile"
 . "$source_environment_tempfile"
 
-# remove_cxxstd
+# remove_cxxstd apply_patch
 source "$(dirname "$AUTOBUILD_VARIABLES_FILE")/functions"
 
+apply_patch "$top/patches/update-cmake-version-compat.patch" "$MINIZLIB_SOURCE_DIR"
+
 # CMake configuration options for all platforms
 config=( \
     -DBUILD_SHARED_LIBS=OFF \
@@ -64,8 +66,8 @@ pushd "$MINIZLIB_SOURCE_DIR"
                 opts="$(replace_switch /Zi /Z7 $LL_BUILD_DEBUG)"
                 plainopts="$(remove_switch /GR $(remove_cxxstd $opts))"
 
-                cmake $(cygpath -m ${top}/${MINIZLIB_SOURCE_DIR}) -G "Ninja Multi-Config" \
-                    -DCMAKE_BUILD_TYPE="Debug" \
+                cmake $(cygpath -m ${top}/${MINIZLIB_SOURCE_DIR}) -G "$AUTOBUILD_WIN_CMAKE_GEN" -A "$AUTOBUILD_WIN_VSPLATFORM" \
+                    -DCMAKE_CONFIGURATION_TYPES="Debug" \
                     -DCMAKE_C_FLAGS:STRING="$plainopts" \
                     -DCMAKE_CXX_FLAGS:STRING="$opts" \
                     -DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT="Embedded" \
@@ -90,8 +92,8 @@ pushd "$MINIZLIB_SOURCE_DIR"
                 opts="$(replace_switch /Zi /Z7 $LL_BUILD_RELEASE)"
                 plainopts="$(remove_switch /GR $(remove_cxxstd $opts))"
 
-                cmake $(cygpath -m ${top}/${MINIZLIB_SOURCE_DIR}) -G "Ninja Multi-Config" \
-                    -DCMAKE_BUILD_TYPE="Release" \
+                cmake $(cygpath -m ${top}/${MINIZLIB_SOURCE_DIR}) -G "$AUTOBUILD_WIN_CMAKE_GEN" -A "$AUTOBUILD_WIN_VSPLATFORM" \
+                    -DCMAKE_CONFIGURATION_TYPES="Release" \
                     -DCMAKE_C_FLAGS:STRING="$plainopts" \
                     -DCMAKE_CXX_FLAGS:STRING="$opts" \
                     -DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT="Embedded" \
@@ -129,7 +131,8 @@ pushd "$MINIZLIB_SOURCE_DIR"
                 pushd "build_$arch"
                     CFLAGS="$cc_opts" \
                     LDFLAGS="$ld_opts" \
-                    cmake ${top}/${MINIZLIB_SOURCE_DIR} -G "Ninja Multi-Config" \
+                    cmake ${top}/${MINIZLIB_SOURCE_DIR} -G "Xcode" \
+                        -DCMAKE_CONFIGURATION_TYPES="Release" \
                         -DCMAKE_C_FLAGS:STRING="$cc_opts" \
                         -DCMAKE_CXX_FLAGS:STRING="$opts" \
                         "${config[@]}" \

patches/update-cmake-version-compat.patch

@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c684e3e..3439270 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,7 +5,7 @@
+ # Copyright (C) 2016 Matthias Schmieder
+ #   schmieder.matthias@gmail.com
+ 
+-cmake_minimum_required(VERSION 3.13)
++cmake_minimum_required(VERSION 3.13...3.31)
+ 
+ # Library version
+ set(VERSION "4.0.8")