Basic support for OpenSSL 1.1.x on windows #1322
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
|
@weltling, thanks for your PR! By analyzing the history of the files in this pull request, we identified @yangtse, @mback2k and @msnelling to be potential reviewers. |
jay
reviewed
Mar 10, 2017
winbuild/MakefileBuild.vc
Outdated
| USE_SSL = true | ||
| SSL = dll | ||
| !ELSEIF "$(WITH_SSL)"=="static" | ||
| !IF EXISTS("$(DEVEL_LIB)\libssl.lib") | ||
| SSL_LIBS = libssl.lib libcrypto.lib ws2_32.lib crypt32.lib gdi32.lib user32.lib crypt32.lib |
There was a problem hiding this comment.
crypt32.lib is twice and also why ws2_32, is that needed?
There was a problem hiding this comment.
Indeed, my typo. Too much of makefiles today :) I was basically refering to https://github.com/openssl/openssl/blob/master/NOTES.WIN#L114, but i see now the ws2_32 and advapi32 are added with WIN_LIBS, so we should be all fine with accordance to the doc.
|
FWIW, I just pulled this down and did a build - changed my build to not do anything special for OpenSSL and it worked a treat. |
|
Thanks guys |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
As pointed out in #1201 already, the OpenSSL 1.1.x lib names have changed, which as consequence makes impossible to link cURL with OpenSSL > 1.0.2. While the aforementioned PR suggested to make lib names configurable, it were also dicussed to first care about the build process present currently. This PR goes for this, the library names are determined by checking the physical existence of the certain files. The newer OpenSSL libs are preferred, while in general there's no change to the current build approach. The only condition is, that the DEVEL dir has to contain either one or the other set of libs, not both at once.