romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 06:03:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

makefile.m32: add multissl support

Browse source 
Closes https://github.com/curl/curl/pull/1840
This commit is contained in:
Viktor Szakats 2017-08-30 10:44:50 +00:00
parent 29c2bdee93
commit c86e21b624
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/Makefile.m32
View file

@ -153,9 +153,7 @@ ZLIB = 1
endif
ifeq ($(findstring -ssh2,$(CFG)),-ssh2)
SSH2 = 1
ifneq ($(findstring -winssl,$(CFG)),-winssl)
SSL = 1
endif
ZLIB = 1
endif
ifeq ($(findstring -ssl,$(CFG)),-ssl)
@ -192,6 +190,11 @@ endif
INCLUDES = -I. -I../include
CFLAGS += -DBUILDING_LIBCURL
ifdef SSL
ifdef WINSSL
CFLAGS += -DCURL_WITH_MULTI_SSL
endif
endif
ifdef SYNC
CFLAGS += -DUSE_SYNC_DNS
@ -257,10 +260,10 @@ ifdef SSL
CFLAGS += -DHAVE_OPENSSL_SRP -DUSE_TLS_SRP
endif
endif
else
ifdef WINSSL
DLL_LIBS += -lcrypt32
endif
ifdef WINSSL
CFLAGS += -DUSE_SCHANNEL
DLL_LIBS += -lcrypt32
endif
ifdef ZLIB
INCLUDES += -I"$(ZLIB_PATH)"
@ -280,9 +283,6 @@ endif
endif
ifdef SSPI
CFLAGS += -DUSE_WINDOWS_SSPI
ifdef WINSSL
CFLAGS += -DUSE_SCHANNEL
endif
endif
ifdef SPNEGO
CFLAGS += -DHAVE_SPNEGO