aboutsummaryrefslogtreecommitdiff
path: root/winbuild
diff options
context:
space:
mode:
authorMarc Hoersken <info@marc-hoersken.de>2012-06-11 19:03:14 +0200
committerDaniel Stenberg <daniel@haxx.se>2012-06-11 19:03:14 +0200
commitcb142cf217fe7e42223d06e80300f1c7f70230a0 (patch)
tree0513fa324a8361f923ee075051ab9d574d2be6e0 /winbuild
parent7da6a9128b0653790d839f5f708f9caa2633e332 (diff)
winbuild: Updated winbuild scripts to add schannel
Diffstat (limited to 'winbuild')
-rw-r--r--winbuild/Makefile.vc4
-rw-r--r--winbuild/MakefileBuild.vc11
2 files changed, 11 insertions, 4 deletions
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