Base code merged to SPIN 2.4

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

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 2829a8b..21e1614 100644 (file)
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -15,12 +15,13 @@ 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>           - 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
@@ -28,7 +29,6 @@ CFGSET=true
 !MESSAGE                                  http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815\r
 !MESSAGE   ENABLE_IPV6=<yes or no>      - Enable IPv6, defaults to yes\r
 !MESSAGE   ENABLE_SSPI=<yes or no>      - Enable SSPI support, defaults to yes\r
-!MESSAGE   ENABLE_SPNEGO=<yes or no>    - Enable Simple and Protected GSSAPI Negotiation Mechanism, defaults to yes\r
 !MESSAGE   ENABLE_WINSSL=<yes or no>    - Enable native Windows SSL support, defaults to yes\r
 !MESSAGE   GEN_PDB=<yes or no>          - Generate Program Database (debug symbols for release build)\r
 !MESSAGE   DEBUG=<yes or no>            - Debug builds\r
@@ -86,16 +86,12 @@ USE_SSPI = true
 USE_SSPI = false\r
 !ENDIF\r
 \r
-!IFNDEF ENABLE_SPNEGO\r
-USE_SPNEGO = true\r
-!ELSEIF "$(ENABLE_SPNEGO)"=="yes"\r
-USE_SPNEGO = true\r
-!ELSEIF "$(ENABLE_SPNEGO)"=="no"\r
-USE_SPNEGO = false\r
-!ENDIF\r
-\r
 !IFNDEF ENABLE_WINSSL\r
+!IFDEF WITH_SSL\r
+USE_WINSSL = false\r
+!ELSE\r
 USE_WINSSL = $(USE_SSPI)\r
+!ENDIF\r
 !ELSEIF "$(ENABLE_WINSSL)"=="yes"\r
 USE_WINSSL = true\r
 !ELSEIF "$(ENABLE_WINSSL)"=="no"\r
@@ -112,6 +108,14 @@ 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
@@ -146,6 +150,10 @@ 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
@@ -162,10 +170,6 @@ CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ipv6
 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-sspi\r
 !ENDIF\r
 \r
-!IF "$(USE_SPNEGO)"=="true"\r
-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-spnego\r
-!ENDIF\r
-\r
 !IF "$(USE_WINSSL)"=="true"\r
 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-winssl\r
 !ENDIF\r
@@ -193,10 +197,9 @@ $(MODE):
        @SET USE_IDN=$(USE_IDN)\r
        @SET USE_IPV6=$(USE_IPV6)\r
        @SET USE_SSPI=$(USE_SSPI)\r
-       @SET USE_SPNEGO=$(USE_SPNEGO)\r
        @SET USE_WINSSL=$(USE_WINSSL)\r
        @$(MAKE) /NOLOGO /F MakefileBuild.vc\r
 \r
 copy_from_lib:\r
        echo copying .c...\r
-       FOR %%i IN ($(CURLX_ONES:/=\)) DO copy %%i ..\src\\r
+       FOR %%i IN ($(CURLX_CFILES:/=\)) DO copy %%i ..\src\\r