]> granicus.if.org Git - curl/commitdiff
winbuild: add basic support for OpenSSL 1.1.x
authorAnatol Belski <ab@php.net>
Fri, 10 Mar 2017 16:04:45 +0000 (17:04 +0100)
committerJay Satiro <raysatiro@yahoo.com>
Mon, 13 Mar 2017 20:05:33 +0000 (16:05 -0400)
- Auto-detect OpenSSL 1.1 libs

Closes https://github.com/curl/curl/pull/1322

winbuild/MakefileBuild.vc

index 96ab37ef8a44ffcaff1c1b725b31ebcc0e425d12..f8296718b86ab042a98ac02f3c171369a0df1b22 100644 (file)
@@ -114,11 +114,19 @@ LFLAGS         = $(LFLAGS) "/LIBPATH:$(DEVEL_LIB)"
 \r
 \r
 !IF "$(WITH_SSL)"=="dll"\r
+!IF EXISTS("$(DEVEL_LIB)\libssl.lib")\r
+SSL_LIBS     = libssl.lib libcrypto.lib\r
+!ELSE\r
 SSL_LIBS     = libeay32.lib ssleay32.lib\r
+!ENDIF\r
 USE_SSL      = true\r
 SSL          = dll\r
 !ELSEIF "$(WITH_SSL)"=="static"\r
+!IF EXISTS("$(DEVEL_LIB)\libssl.lib")\r
+SSL_LIBS     = libssl.lib libcrypto.lib gdi32.lib user32.lib crypt32.lib\r
+!ELSE\r
 SSL_LIBS     = libeay32.lib ssleay32.lib gdi32.lib user32.lib crypt32.lib\r
+!ENDIF\r
 USE_SSL      = true\r
 SSL          = static\r
 !ENDIF\r