Revert "Imported Upstream version 7.44.0"

[platform/upstream/curl.git] / winbuild / Makefile.vc

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 5b726cd..6dc58c4 100644 (file)
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -15,13 +15,12 @@ CFGSET=true
 \r
 !MESSAGE Usage: nmake /f Makefile.vc mode=<static or dll> <options>\r
 !MESSAGE where <options> is one or many of:\r
-!MESSAGE   VC=<6,7,8,9,10,11,12,14>     - VC versions\r
+!MESSAGE   VC=<6,7,8,9,10,11,12>        - VC versions\r
 !MESSAGE   WITH_DEVEL=<path>            - Paths for the development files (SSL, zlib, etc.)\r
 !MESSAGE                                  Defaults to sibbling directory deps: ../deps\r
 !MESSAGE                                  Libraries can be fetched at http://pecl2.php.net/downloads/php-windows-builds/\r
 !MESSAGE                                  Uncompress them into the deps folder.\r
 !MESSAGE   WITH_SSL=<dll or static>     - Enable OpenSSL support, DLL or static\r
-!MESSAGE   WITH_CARES=<dll or static>   - Enable c-ares support, DLL or static\r
 !MESSAGE   WITH_ZLIB=<dll or static>    - Enable zlib support, DLL or static\r
 !MESSAGE   WITH_SSH2=<dll or static>    - Enable libSSH2 support, DLL or static\r
 !MESSAGE   ENABLE_IDN=<yes or no>       - Enable use of Windows IDN APIs, defaults to yes\r
@@ -108,14 +107,6 @@ USE_SSL = true
 SSL     = static\r
 !ENDIF\r
 \r
-!IF "$(WITH_CARES)"=="dll"\r
-USE_CARES = true\r
-CARES     = dll\r
-!ELSEIF "$(WITH_CARES)"=="static"\r
-USE_CARES = true\r
-CARES     = static\r
-!ENDIF\r
-\r
 !IF "$(WITH_ZLIB)"=="dll"\r
 USE_ZLIB = true\r
 ZLIB     = dll\r
@@ -150,10 +141,6 @@ CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-static
 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ssl-$(SSL)\r
 !ENDIF\r
 \r
-!IF "$(USE_CARES)"=="true"\r
-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-cares-$(CARES)\r
-!ENDIF\r
-\r
 !IF "$(USE_ZLIB)"=="true"\r
 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-zlib-$(ZLIB)\r
 !ENDIF\r