diff options
Diffstat (limited to 'winbuild/Makefile.vc')
| -rw-r--r-- | winbuild/Makefile.vc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc index 9e1eb07d0..bd5c8e032 100644 --- a/winbuild/Makefile.vc +++ b/winbuild/Makefile.vc @@ -38,10 +38,6 @@ CFGSET=true !ENDIF -!IF DEFINED(WITH_SSL) && DEFINED(ENABLE_WINSSL) || DEFINED(WITH_SSL) && DEFINED(WITH_MBEDTLS) || DEFINED(WITH_MBEDTLS) && DEFINED(ENABLE_WINSSL) -!ERROR WITH_SSL, WITH_MBEDTLS and ENABLE_WINSSL are mutual exclusive options. -!ENDIF - !INCLUDE "../lib/Makefile.inc" LIBCURL_OBJS=$(CSOURCES:.c=.obj) @@ -118,6 +114,12 @@ 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 |