Commit db87bcfc authored by Anatol Belski's avatar Anatol Belski Committed by Jay Satiro
Browse files

winbuild: add basic support for OpenSSL 1.1.x 

- Auto-detect OpenSSL 1.1 libs

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

winbuild/MakefileBuild.vc

+8 −0
Original line number Original line Diff line number Diff line
@@ -114,11 +114,19 @@ LFLAGS = $(LFLAGS) "/LIBPATH:$(DEVEL_LIB)" 








!IF "$(WITH_SSL)"=="dll"

!IF "$(WITH_SSL)"=="dll"

!IF EXISTS("$(DEVEL_LIB)\libssl.lib")

SSL_LIBS     = libssl.lib libcrypto.lib

!ELSE

SSL_LIBS     = libeay32.lib ssleay32.lib

SSL_LIBS     = libeay32.lib ssleay32.lib

!ENDIF

USE_SSL      = true

USE_SSL      = true

SSL          = dll

SSL          = dll

!ELSEIF "$(WITH_SSL)"=="static"

!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

SSL_LIBS     = libeay32.lib ssleay32.lib gdi32.lib user32.lib crypt32.lib

!ENDIF

USE_SSL      = true

USE_SSL      = true

SSL          = static

SSL          = static

!ENDIF

!ENDIF