diff options
| author | Anatol Belski <ab@php.net> | 2017-03-10 17:04:45 +0100 |
|---|---|---|
| committer | Jay Satiro <raysatiro@yahoo.com> | 2017-03-13 16:05:33 -0400 |
| commit | db87bcfcf21f8c3b8188d0c5ab82faf804ffd5ea (patch) | |
| tree | 122c6ae5e3bf323c62235d44574c7198abe70edb /winbuild | |
| parent | bfb2a0ad77daaec5ced53ddce80ca01f2d0cc685 (diff) | |
| download | curl-db87bcfcf21f8c3b8188d0c5ab82faf804ffd5ea.tar.gz | |
winbuild: add basic support for OpenSSL 1.1.x
- Auto-detect OpenSSL 1.1 libs
Closes https://github.com/curl/curl/pull/1322
Diffstat (limited to 'winbuild')
| -rw-r--r-- | winbuild/MakefileBuild.vc | 8 |
1 files changed, 8 insertions, 0 deletions
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
|