From d20659fc74975e27962655d1b337da8cf3646638 Mon Sep 17 00:00:00 2001 From: Vollstrecker Date: Thu, 6 Feb 2025 08:28:18 +0100 Subject: Repair MinGW cmake build. --- win32/Makefile.gcc | 2 +- win32/zlib1.rc | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'win32') 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 ARFLAGS = rcs RC = $(PREFIX)windres -RCFLAGS = --define GCC_WINDRES +RCFLAGS = STRIP = $(PREFIX)strip 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 @@ #include #include "../zlib.h" -#ifdef GCC_WINDRES 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 PRODUCTVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -- cgit v1.2.3-55-g6feb