summaryrefslogtreecommitdiff
path: root/winbuild
diff options
context:
space:
mode:
Diffstat (limited to 'winbuild')
-rw-r--r--winbuild/Makefile.vc6
-rw-r--r--winbuild/MakefileBuild.vc6
2 files changed, 6 insertions, 6 deletions
diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 94ce8db36..26ab90693 100644
--- 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 3125c21b8..8d942b759 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -479,6 +479,12 @@ CFLAGS = $(CFLAGS) $(CFLAGS_PDB) /Fd"$(LIB_DIROBJ)\$(PDB)"
LFLAGS = $(LFLAGS) $(LFLAGS_PDB)
!ENDIF
+!IF ( "$(USE_SSL)"=="true" && "$(USE_WINSSL)"=="true" ) \
+ || ( "$(USE_SSL)"=="true" && "$(USE_MBEDTLS)"=="true" ) \
+ || ( "$(USE_MBEDTLS)"=="true" && "$(USE_WINSSL)"=="true" )
+CFLAGS = $(CFLAGS) /DCURL_WITH_MULTI_SSL
+!ENDIF
+
LIB_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-lib
CURL_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-curl
DIRDIST = ..\builds\$(CONFIG_NAME_LIB)\