aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVollstrecker <werner@vollstreckernet.de>2025-02-06 08:28:18 +0100
committerMark Adler <madler@alumni.caltech.edu>2025-02-06 16:23:45 -0800
commitd20659fc74975e27962655d1b337da8cf3646638 (patch)
treec62941a6d8581da79e7b67f39a8eafbe7e20e5fb
parent0b29118367551a44612a725970f7f6ff258cab06 (diff)
downloadzlib-d20659fc74975e27962655d1b337da8cf3646638.tar.gz
zlib-d20659fc74975e27962655d1b337da8cf3646638.tar.bz2
zlib-d20659fc74975e27962655d1b337da8cf3646638.zip
Repair MinGW cmake build.
-rw-r--r--CMakeLists.txt5
-rw-r--r--win32/Makefile.gcc2
-rw-r--r--win32/zlib1.rc5
3 files changed, 2 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d963e7c..a46b2c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,11 +155,6 @@ set(ZLIB_SRCS
155 uncompr.c 155 uncompr.c
156 zutil.c) 156 zutil.c)
157 157
158set_source_files_properties(
159 win32/zlib1.rc
160 PROPERTIES COMPILE_FLAGS
161 $<$<STREQUAL:${CMAKE_RC_OUTPUT_EXTENSION},.obj>:-DGCC_WINDRES>)
162
163if(WIN32) 158if(WIN32)
164 set(zlib_static_suffix "s") 159 set(zlib_static_suffix "s")
165 set(CMAKE_DEBUG_POSTFIX "d") 160 set(CMAKE_DEBUG_POSTFIX "d")
diff --git a/win32/Makefile.gcc b/win32/Makefile.gcc
index 081e391..35172fb 100644
--- a/win32/Makefile.gcc
+++ b/win32/Makefile.gcc
@@ -50,7 +50,7 @@ AR = $(PREFIX)ar
50ARFLAGS = rcs 50ARFLAGS = rcs
51 51
52RC = $(PREFIX)windres 52RC = $(PREFIX)windres
53RCFLAGS = --define GCC_WINDRES 53RCFLAGS =
54 54
55STRIP = $(PREFIX)strip 55STRIP = $(PREFIX)strip
56 56
diff --git a/win32/zlib1.rc b/win32/zlib1.rc
index ceb4ee5..e4847d8 100644
--- a/win32/zlib1.rc
+++ b/win32/zlib1.rc
@@ -1,11 +1,8 @@
1#include <winver.h> 1#include <winver.h>
2#include "../zlib.h" 2#include "../zlib.h"
3 3
4#ifdef GCC_WINDRES
5VS_VERSION_INFO VERSIONINFO 4VS_VERSION_INFO VERSIONINFO
6#else 5
7VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
8#endif
9 FILEVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0 6 FILEVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
10 PRODUCTVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0 7 PRODUCTVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
11 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK 8 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK