diff options
| -rw-r--r-- | winbuild/Makefile.vc | 14 | ||||
| -rw-r--r-- | winbuild/MakefileBuild.vc | 20 |
2 files changed, 30 insertions, 4 deletions
diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc index a45e4ee56..59e29d6c1 100644 --- a/winbuild/Makefile.vc +++ b/winbuild/Makefile.vc @@ -27,6 +27,7 @@ CFGSET=true !MESSAGE ENABLE_IPV6=<yes or no> - Enable IPV6, default to yes
!MESSAGE ENABLE_IDN=<yes or no> - Wheter or not to use IDN Windows APIs. Requires Windows Vista or later.
!MESSAGE or to install http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815
+!MESSAGE ENABLE_WINSSL=<yes or no> - Enable native Windows SSL support, default to yes
!MESSAGE GEN_PDB=<yes or no> - Generate Program Database (debug symbols release build)
!MESSAGE DEBUG=<yes or no> - Debug builds
!ERROR please choose a valid mode
@@ -65,6 +66,14 @@ USE_IDN = true USE_IDN = false
!ENDIF
+!IFNDEF ENABLE_WINSSL
+USE_WINSSL = true
+!ELSEIF "$(ENABLE_WINSSL)"=="yes"
+USE_WINSSL = true
+!ELSEIF "$(ENABLE_WINSSL)"=="no"
+USE_WINSSL = false
+!ENDIF
+
CONFIG_NAME_LIB = libcurl
!IF "$(WITH_SSL)"=="dll"
@@ -123,6 +132,10 @@ CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ipv6 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-sspi
!ENDIF
+!IF "$(USE_WINSSL)"=="true"
+CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-winssl
+!ENDIF
+
!MESSAGE configuration name: $(CONFIG_NAME_LIB)
BUILD_DIR=../builds/$(CONFIG_NAME_LIB)
@@ -141,6 +154,7 @@ $(MODE): @gen_resp_file.bat $(CURL_OBJS)
@SET USE_IPV6=$(USE_IPV6)
@SET USE_IDN=$(USE_IDN)
+ @SET USE_WINSSL=$(USE_WINSSL)
@$(MAKE) /NOLOGO /F MakefileBuild.vc
copy_from_lib:
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 6ac9a7548..513c344ee 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -143,12 +143,23 @@ SSH2_CFLAGS = $(SSH2_CFLAGS) /I$(WITH_DEVEL)/include/libssh2 !ENDIF -!IFDEF USE_WINSSL +!IFNDEF USE_WINSSL +!IF "$(USE_SSL)"=="true" +USE_WINSSL = false +!ELSE +USE_WINSSL = true +!ENDIF +!ELSEIF "$(USE_WINSSL)"=="yes" +USE_WINSSL = true +!ENDIF + +!IF "$(USE_WINSSL)"=="true" CFLAGS_SSPI = /DUSE_SCHANNEL USE_SCHANNEL = true USE_SSPI = yes !ENDIF + !IFNDEF USE_SSPI USE_SSPI = yes !ENDIF @@ -298,11 +309,11 @@ CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ipv6 !IF "$(USE_SSPI)"=="true" CFLAGS = $(CFLAGS) $(CFLAGS_SSPI) -!IF "$(USE_SCHANNEL)"=="true" -CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-sspi-schannel -!ELSE CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-sspi !ENDIF + +!IF "$(USE_WINSSL)"=="true" +CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-winssl !ENDIF !IF "$(GEN_PDB)"=="true" @@ -362,6 +373,7 @@ $(TARGET): $(LIB_OBJS) $(LIB_DIROBJ) $(DISTDIR) @echo Using SSPI: $(USE_SSPI) @echo Using IPv6: $(USE_IPV6) @echo Using IDN: $(USE_IDN) + @echo Using WinSSL: $(USE_WINSSL) @echo CFLAGS: $(CFLAGS) @echo LFLAGS: $(LFLAGS) @echo GenPDB: $(GEN_PDB) |