Skip to content

Commit

Permalink
winbuild: add basic support for OpenSSL 1.1.x
Browse files Browse the repository at this point in the history
- Auto-detect OpenSSL 1.1 libs

Closes #1322
  • Loading branch information
weltling authored and jay committed Mar 13, 2017
1 parent bfb2a0a commit db87bcf
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions winbuild/MakefileBuild.vc
Expand Up @@ -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
Expand Down

0 comments on commit db87bcf

Please sign in to comment.