Commit cb142cf2 authored by Marc Hoersken's avatar Marc Hoersken Committed by Daniel Stenberg
Browse files

winbuild: Updated winbuild scripts to add schannel

parent 7da6a912

lib/Makefile.inc

+2 −2
Original line number Diff line number Diff line
@@ -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

winbuild/Makefile.vc

+4 −0
Original line number Diff line number Diff line
@@ -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"

winbuild/MakefileBuild.vc

+7 −4
Original line number Diff line number Diff line
@@ -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