Commit 6bdc6092 authored by Jan Ehrhardt's avatar Jan Ehrhardt Committed by Daniel Stenberg
Browse files

winbuild/Makefile.vc: Fix check on SSL, MBEDTLS, WINSSL exclusivity 

Closes #818
parent fd8d2a0f

winbuild/Makefile.vc

+6 −4
Original line number Diff line number Diff line
@@ -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