c/zlib
1
0
Fork 0
mirror of https://github.com/madler/zlib synced 2025-03-28 21:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Repair MinGW cmake build.

Browse Source
This commit is contained in:
Vollstrecker 2025-02-06 08:28:18 +01:00 committed by Mark Adler
parent 0b29118367
commit d20659fc74
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -155,11 +155,6 @@ set(ZLIB_SRCS
uncompr.c uncompr.c
zutil.c) zutil.c)
set_source_files_properties(
win32/zlib1.rc
PROPERTIES COMPILE_FLAGS
$<$<STREQUAL:${CMAKE_RC_OUTPUT_EXTENSION},.obj>:-DGCC_WINDRES>)
if(WIN32) if(WIN32)
set(zlib_static_suffix "s") set(zlib_static_suffix "s")
set(CMAKE_DEBUG_POSTFIX "d") set(CMAKE_DEBUG_POSTFIX "d")

2
win32/Makefile.gcc
View File

@ -50,7 +50,7 @@ AR = $(PREFIX)ar
ARFLAGS = rcs ARFLAGS = rcs
RC = $(PREFIX)windres RC = $(PREFIX)windres
RCFLAGS = --define GCC_WINDRES RCFLAGS =
STRIP = $(PREFIX)strip STRIP = $(PREFIX)strip

5
win32/zlib1.rc
View File

@ -1,11 +1,8 @@
#include <winver.h> #include <winver.h>
#include "../zlib.h" #include "../zlib.h"
#ifdef GCC_WINDRES
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
#else
VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
#endif
FILEVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0 FILEVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
PRODUCTVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0 PRODUCTVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGSMASK VS_FFI_FILEFLAGSMASK