moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

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

Browse Source 
Closes #818
This commit is contained in:
Jan-E 2016-05-19 22:35:50 +02:00 committed by Daniel Stenberg
parent fd8d2a0f63
commit 6bdc6092a0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
winbuild/Makefile.vc
View File

@ -38,10 +38,6 @@ CFGSET=true
!ENDIF !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" !INCLUDE "../lib/Makefile.inc"
LIBCURL_OBJS=$(CSOURCES:.c=.obj) LIBCURL_OBJS=$(CSOURCES:.c=.obj)
@ -118,6 +114,12 @@ USE_MBEDTLS = true
MBEDTLS = $(WITH_MBEDTLS) MBEDTLS = $(WITH_MBEDTLS)
!ENDIF !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" !IF "$(WITH_CARES)"=="dll"
USE_CARES = true USE_CARES = true
CARES = dll CARES = dll