zlib icon indicating copy to clipboard operation
zlib copied to clipboard

Published 20 hours ago • verified publisher icon madler

cmake: respect custom RC flags with mingw + delete GCC_WINDRES

Open vszakats opened this issue 1 year ago • 1 comments

Before this patch, zlib.rc was compiled using a manual command [1] when using the MinGW toolchain. This method ignores CMAKE_RC_FLAGS and offers no other way to pass a custom flag, breaking the build in cases where a custom windres option is required. E.g. --target= or -I on some platforms and configuration, in particular with llvm-windres.

This patch deletes the special case for MinGW and lets CMake compile the .rc file via the standard way used for all WIN32.

Also:

  • Adjust the condition for dealing with the .rc file from NOT MINGW to WIN32, thus omitting this unnecessary input file for non-Windows platforms.

  • Delete the MinGW-specific RC flag GCC_WINDRES. GCC_WINDRES was protecting logic that compiles fine with recent windres versions. Also, the protected line contained obsolete, 16-bit era keywords that had no effect for a long time. [2]

  • Delete the MinGW-specific defaulting logic for CMAKE_RC_COMPILER. This is done by CMake automatically, to the more portable default value windres (there is no .exe extension in cross-toolchains).

[1] dc5a43ebfadb6b775f6e64bfeb5a461c66acb394 [2] https://docs.microsoft.com/windows/win32/menurc/common-resource-attributes

vszakats avatar Jul 11 '22 16:07 vszakats

@madler Any love for this PR?

vszakats avatar Oct 14 '22 11:10 vszakats

@nmoinvaz Can you enable CI workflows for this PR please?

vszakats avatar Oct 25 '22 19:10 vszakats

Hey @vszakats, sorry I don't have access. I'm just a pleb like everybody else here. 😂

nmoinvaz avatar Oct 25 '22 20:10 nmoinvaz

Oh, okay, no worries, I do understand the feeling! :)

[ as a shot in the abyss why this PR is not going anywhere, I was about to reinstate the Windows 16-bit bits, if maybe this is a reason for the silence. For the sake of all those Windows 3.11 users out there. One can only guess. ]

vszakats avatar Oct 25 '22 20:10 vszakats

Updated the patch to keep support for these legacy bits:

  1. Windows 16-bit Resource flags.
  2. MinGW releases that do not support those Windows 16-bit Resource flags.

Please let me know if there is any other concern.

vszakats avatar Oct 25 '22 22:10 vszakats

Added a build error log to the top post.

vszakats avatar Oct 26 '22 00:10 vszakats