aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Makefile.inc4
-rw-r--r--winbuild/Makefile.vc4
-rw-r--r--winbuild/MakefileBuild.vc11
3 files changed, 13 insertions, 6 deletions
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index e39aa8447..7ff4aeab9 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -23,7 +23,7 @@ CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c \
curl_rtmp.c openldap.c curl_gethostname.c gopher.c axtls.c \
idn_win32.c http_negotiate_sspi.c cyassl.c http_proxy.c non-ascii.c \
asyn-ares.c asyn-thread.c curl_gssapi.c curl_ntlm.c curl_ntlm_wb.c \
- curl_ntlm_core.c curl_ntlm_msgs.c curl_sasl.c
+ curl_ntlm_core.c curl_ntlm_msgs.c curl_sasl.c curl_schannel.c
HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h \
progress.h formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h \
@@ -40,4 +40,4 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h \
warnless.h curl_hmac.h polarssl.h curl_rtmp.h curl_gethostname.h \
gopher.h axtls.h cyassl.h http_proxy.h non-ascii.h asyn.h curl_ntlm.h \
curl_gssapi.h curl_ntlm_wb.h curl_ntlm_core.h curl_ntlm_msgs.h \
- curl_sasl.h
+ curl_sasl.h curl_schannel.h
diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index a45e4ee56..a35e9beab 100644
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -73,6 +73,10 @@ SSL = dll
!ELSEIF "$(WITH_SSL)"=="static"
USE_SSL = true
SSL = static
+!ELSEIF "$(WITH_SSL)"=="schannel"
+USE_SSL = true
+USE_SSPI = true
+SSL = schannel
!ENDIF
!IF "$(WITH_ZLIB)"=="dll"
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index fefc2c65b..92b4bbb0d 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -97,16 +97,19 @@ LFLAGS = $(LFLAGS) "/LIBPATH:$(DEVEL_LIB)"
!IF "$(WITH_SSL)"=="dll"
SSL_LIBS = libeay32.lib ssleay32.lib
+SSL_CFLAGS = /DUSE_SSLEAY /I"$(DEVEL_INCLUDE)/openssl"
USE_SSL = true
SSL = dll
!ELSEIF "$(WITH_SSL)"=="static"
SSL_LIBS = libeay32.lib ssleay32.lib gdi32.lib user32.lib advapi32.lib
+SSL_CFLAGS = /DUSE_SSLEAY /I"$(DEVEL_INCLUDE)/openssl"
USE_SSL = true
SSL = static
-!ENDIF
-
-!IFDEF USE_SSL
-SSL_CFLAGS = /DUSE_SSLEAY /I"$(DEVEL_INCLUDE)/openssl"
+!ELSEIF "$(WITH_SSL)"=="schannel"
+USE_SSL = true
+USE_SSPI = yes
+SSL_CFLAGS = /DUSE_SSL /DUSE_SCHANNEL
+SSL = schannel
!ENDIF