winbuild: Support MultiSSL builds

- Remove the lines in winbuild/Makefile.vc that generate an error with
  multiple SSL backends.

- Add /DCURL_WITH_MULTI_SSL in winbuild/MakefileBuild.vc if multiple SSL
  backends are set.

Closes https://github.com/curl/curl/pull/3772

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 94ce8db3634cbca34041cc68dc8227627385b205..26ab9069336a3afd2e6a21ea72bd11b3382cc63b 100644 (file)
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -168,12 +168,6 @@ USE_MBEDTLS = true
 MBEDTLS     = $(WITH_MBEDTLS)
 !ENDIF
 
-!IF ( "$(USE_SSL)"=="true" && "$(USE_WINSSL)"=="true" ) \
- || ( "$(USE_SSL)"=="true" && "$(USE_MBEDTLS)"=="true" ) \
- || ( "$(USE_MBEDTLS)"=="true" && "$(USE_WINSSL)"=="true" )
-!ERROR SSL, MBEDTLS and WINSSL are mutual exclusive options.
-!ENDIF
-
 !IF "$(WITH_CARES)"=="dll"
 USE_CARES = true
 CARES     = dll

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 3125c21b8f2e3569f5d0eef9f0fcf7209b3ff339..8d942b759e3e53e89e94186df9f15b7fb715e9ff 100644 (file)
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -479,6 +479,12 @@ CFLAGS = $(CFLAGS) $(CFLAGS_PDB) /Fd"$(LIB_DIROBJ)\$(PDB)"
 LFLAGS = $(LFLAGS) $(LFLAGS_PDB)\r
 !ENDIF\r
 \r
+!IF ( "$(USE_SSL)"=="true" && "$(USE_WINSSL)"=="true" ) \\r
+ || ( "$(USE_SSL)"=="true" && "$(USE_MBEDTLS)"=="true" ) \\r
+ || ( "$(USE_MBEDTLS)"=="true" && "$(USE_WINSSL)"=="true" )\r
+CFLAGS = $(CFLAGS) /DCURL_WITH_MULTI_SSL\r
+!ENDIF\r
+\r
 LIB_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-lib\r
 CURL_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-curl\r
 DIRDIST = ..\builds\$(CONFIG_NAME_LIB)\\r