mirror of
https://github.com/moparisthebest/curl
synced 2024-12-23 00:28:48 -05:00
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
This commit is contained in:
parent
6003422825
commit
79c4864a56
@ -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
|
||||
|
@ -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)\
|
||||
|
Loading…
Reference in New Issue
Block a user