Revert "Update to 7.40.1"

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

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index fcffc74..90719a8 100644 (file)
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -15,7 +15,7 @@ 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>              - 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
@@ -32,6 +32,7 @@ CFGSET=true
 !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
+!MESSAGE   MACHINE=<x86 or x64>         - Target architecture (default x64 on AMD64, x86 on others)\r
 !ERROR please choose a valid mode\r
 \r
 !ENDIF\r
@@ -39,11 +40,10 @@ CFGSET=true
 !INCLUDE "../lib/Makefile.inc"\r
 LIBCURL_OBJS=$(CSOURCES:.c=.obj)\r
 \r
-top_srcdir=..\r
 !INCLUDE "../src/Makefile.inc"\r
 \r
-# hugehelp has a special rule\r
-CURL_OBJS=$(CURL_CFILES:hugehelp.c=)\r
+# tool_hugehelp has a special rule\r
+CURL_OBJS=$(CURL_CFILES:tool_hugehelp.c=)\r
 \r
 CURL_OBJS=$(CURL_OBJS:.c=.obj)\r
 \r
@@ -54,10 +54,14 @@ ENABLE_SSPI = $(USE_SSPI)
 !ENDIF\r
 \r
 # default options\r
-!IFNDEF MACHINE
-MACHINE = X86
-!ENDIF
-
+!IFNDEF MACHINE\r
+!IF "$(PROCESSOR_ARCHITECTURE)"=="AMD64"\r
+MACHINE = x64\r
+!ELSE\r
+MACHINE = x86\r
+!ENDIF\r
+!ENDIF\r
+\r
 !IFNDEF ENABLE_IDN\r
 USE_IDN = true\r
 !ELSEIF "$(ENABLE_IDN)"=="yes"\r
@@ -91,7 +95,11 @@ USE_SPNEGO = false
 !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
@@ -124,8 +132,8 @@ USE_SSH2 = true
 SSH2     = static\r
 !ENDIF\r
 \r
-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-$(MACHINE)
-
+CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-vc$(VC)-$(MACHINE)\r
+\r
 !IF "$(DEBUG)"=="yes"\r
 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-debug\r
 !ELSE\r
@@ -174,18 +182,18 @@ CURL_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-curl
 DIRDIST = ..\builds\$(CONFIG_NAME_LIB)\\r
 \r
 $(MODE):\r
-       @SET DIROBJ=$(LIBCURL_DIROBJ)
+       @SET DIROBJ=$(LIBCURL_DIROBJ)\r
        @SET MACRO_NAME=LIBCURL_OBJS\r
        @SET OUTFILE=LIBCURL_OBJS.inc\r
        @gen_resp_file.bat $(LIBCURL_OBJS)\r
-
-       @SET DIROBJ=$(CURL_DIROBJ)
+\r
+       @SET DIROBJ=$(CURL_DIROBJ)\r
        @SET MACRO_NAME=CURL_OBJS\r
        @SET OUTFILE=CURL_OBJS.inc\r
        @gen_resp_file.bat $(CURL_OBJS)\r
-
-       @SET CONFIG_NAME_LIB=$(CONFIG_NAME_LIB)
-       @SET MACHINE=$(MACHINE)
+\r
+       @SET CONFIG_NAME_LIB=$(CONFIG_NAME_LIB)\r
+       @SET MACHINE=$(MACHINE)\r
        @SET USE_IDN=$(USE_IDN)\r
        @SET USE_IPV6=$(USE_IPV6)\r
        @SET USE_SSPI=$(USE_SSPI)\r
@@ -195,4 +203,4 @@ $(MODE):
 \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