winbuild: fail to build WITH_ZLIB=static #11521
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jay
reviewed
Jul 27, 2023
| @@ -262,8 +262,8 @@ ZLIB_LIBS = zlib.lib | |||
| USE_ZLIB = true | |||
| ZLIB = dll | |||
| !ELSEIF "$(WITH_ZLIB)"=="static" | |||
| !IF EXISTS("$(ZLIB_LIB_DIR)\zlibstat.lib") | |||
| ZLIB_LIBS = zlibstat.lib | |||
There was a problem hiding this comment.
Not a typo, the visual studio zlibstat project's output is zlibstat.lib. Where are you getting zlibstatic.lib from? Are you using a different build method?
|
I use cmake generate visual studio project. It's zlib's bug, may be. |
jay
reviewed
Jul 28, 2023
| @@ -265,6 +265,8 @@ ZLIB = dll | |||
| !IF EXISTS("$(ZLIB_LIB_DIR)\zlibstat.lib") | |||
| ZLIB_LIBS = zlibstat.lib | |||
| ADDITIONAL_ZLIB_CFLAGS = /DZLIB_WINAPI | |||
| !ELSEIF EXISTS("$(ZLIB_LIB_DIR)\zlibstatic.lib") | |||
| ZLIB_LIBS = zlibstatic.lib | |||
There was a problem hiding this comment.
@MarcelRaad can you confirm- unlike zlib's contrib VS project files, something like zlibstatic.lib (cmake outfile) doesn't need /DZLIB_WINAPI ?
There was a problem hiding this comment.
Yes, I can confirm that ZLIB_WINAPI is only defined by the VS projects by default.
|
Thanks |
ptitSeb
pushed a commit
to wasix-org/curl
that referenced
this pull request
Sep 25, 2023
- Check for zlib static library name zlibstatic.lib. zlib's static library has a different name depending on how it was built. zlibstatic.lib is output by cmake. zlibstat.lib is output by their pre-generated Visual Studio project files (in the contrib directory) and defines ZLIB_WINAPI (ie it's meant to use stdcall instead of cdecl if you end up exporting the zlib functions). Prior to this change the makefile only checked for the latter. Closes curl#11521
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.