From db87bcfcf21f8c3b8188d0c5ab82faf804ffd5ea Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 10 Mar 2017 17:04:45 +0100 Subject: [PATCH] winbuild: add basic support for OpenSSL 1.1.x - Auto-detect OpenSSL 1.1 libs Closes https://github.com/curl/curl/pull/1322 --- winbuild/MakefileBuild.vc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 96ab37ef8..f8296718b 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -114,11 +114,19 @@ LFLAGS = $(LFLAGS) "/LIBPATH:$(DEVEL_LIB)" !IF "$(WITH_SSL)"=="dll" +!IF EXISTS("$(DEVEL_LIB)\libssl.lib") +SSL_LIBS = libssl.lib libcrypto.lib +!ELSE SSL_LIBS = libeay32.lib ssleay32.lib +!ENDIF USE_SSL = true SSL = dll !ELSEIF "$(WITH_SSL)"=="static" +!IF EXISTS("$(DEVEL_LIB)\libssl.lib") +SSL_LIBS = libssl.lib libcrypto.lib gdi32.lib user32.lib crypt32.lib +!ELSE SSL_LIBS = libeay32.lib ssleay32.lib gdi32.lib user32.lib crypt32.lib +!ENDIF USE_SSL = true SSL = static !ENDIF