diff options
| author | Jan-E <github@ehrhardt.nl> | 2019-04-12 23:41:13 +0200 |
|---|---|---|
| committer | Jay Satiro <raysatiro@yahoo.com> | 2019-04-13 02:49:14 -0400 |
| commit | 79c4864a563824b19044ef98599f0ccdad262e84 (patch) | |
| tree | 14054180206ce92a796ef68c0f375349d8f709b8 /winbuild/Makefile.vc | |
| parent | 60034228255894fcea57950b3b39bfe6f5fca580 (diff) | |
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
Diffstat (limited to 'winbuild/Makefile.vc')
| -rw-r--r-- | winbuild/Makefile.vc | 6 |
1 files changed, 0 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 |