Imported Upstream version 7.28.1

4 files changed, 54 insertions, 37 deletions

diff --git a/winbuild/BUILD.WINDOWS.txt b/winbuild/BUILD.WINDOWS.txt
index 53030cb9..5eac3820 100644
--- a/winbuild/BUILD.WINDOWS.txt
+++ b/winbuild/BUILD.WINDOWS.txt
@@ -68,3 +68,4 @@ where <options> is one or many of:
   ENABLE_WINSSL=<yes or no>    - Enable native Windows SSL support, defaults to yes

   GEN_PDB=<yes or no>          - Generate Program Database (debug symbols for release build)

   DEBUG=<yes or no>            - Debug builds

+  MACHINE=<x86 or x64>         - Target architecture (default is x86)
\ No newline at end of file
diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 137be213..bc93c4b5 100644
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -32,6 +32,7 @@ CFGSET=true
 !MESSAGE   ENABLE_WINSSL=<yes or no>    - Enable native Windows SSL support, defaults to yes

 !MESSAGE   GEN_PDB=<yes or no>          - Generate Program Database (debug symbols for release build)

 !MESSAGE   DEBUG=<yes or no>            - Debug builds

+!MESSAGE   MACHINE=<x86 or x64>         - Target architecture (default x64 on AMD64, x86 on others)

 !ERROR please choose a valid mode

 

 !ENDIF

@@ -54,6 +55,14 @@ ENABLE_SSPI = $(USE_SSPI)
 !ENDIF

 

 # default options

+!IFNDEF MACHINE

+!IF "$(PROCESSOR_ARCHITECTURE)"=="AMD64"

+MACHINE = x64

+!ELSE

+MACHINE = x86

+!ENDIF

+!ENDIF

+

 !IFNDEF ENABLE_IDN

 USE_IDN = true

 !ELSEIF "$(ENABLE_IDN)"=="yes"

@@ -120,6 +129,8 @@ USE_SSH2 = true
 SSH2     = static

 !ENDIF

 

+CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-vc$(VC)-$(MACHINE)

+

 !IF "$(DEBUG)"=="yes"

 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-debug

 !ELSE

@@ -168,14 +179,18 @@ CURL_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-curl
 DIRDIST = ..\builds\$(CONFIG_NAME_LIB)\

 

 $(MODE):

-	@SET LIBCURL_DIROBJ=$(LIBCURL_DIROBJ)

+	@SET DIROBJ=$(LIBCURL_DIROBJ)

 	@SET MACRO_NAME=LIBCURL_OBJS

 	@SET OUTFILE=LIBCURL_OBJS.inc

 	@gen_resp_file.bat $(LIBCURL_OBJS)

-	@SET LIBCURL_DIROBJ=$(CURL_DIROBJ)

+

+	@SET DIROBJ=$(CURL_DIROBJ)

 	@SET MACRO_NAME=CURL_OBJS

 	@SET OUTFILE=CURL_OBJS.inc

 	@gen_resp_file.bat $(CURL_OBJS)

+

+	@SET CONFIG_NAME_LIB=$(CONFIG_NAME_LIB)

+	@SET MACHINE=$(MACHINE)

 	@SET USE_IDN=$(USE_IDN)

 	@SET USE_IPV6=$(USE_IPV6)

 	@SET USE_SSPI=$(USE_SSPI)

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index d0478791..7e2904bb 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -66,12 +66,24 @@ LFLAGS_PDB = /incremental:no /opt:ref,icf
 

 CFLAGS_LIBCURL_STATIC  = /DCURL_STATICLIB

 

-LIB_NAME_STATIC        = libcurl_a.lib

-LIB_NAME_STATIC_DEBUG  = libcurl_a_debug.lib

-LIB_NAME_DLL           = libcurl.dll

-LIB_NAME_IMP           = libcurl.lib

-LIB_NAME_DLL_DEBUG     = libcurl_debug.dll

-LIB_NAME_IMP_DEBUG     = libcurl_debug.lib

+WIN_LIBS    = ws2_32.lib wldap32.lib advapi32.lib

+

+BASE_NAME              = libcurl

+BASE_NAME_DEBUG        = $(BASE_NAME)_debug

+BASE_NAME_STATIC       = $(BASE_NAME)_a

+BASE_NAME_STATIC_DEBUG = $(BASE_NAME_STATIC)_debug

+

+LIB_NAME_STATIC        = $(BASE_NAME_STATIC).lib

+LIB_NAME_STATIC_DEBUG  = $(BASE_NAME_STATIC_DEBUG).lib

+LIB_NAME_DLL           = $(BASE_NAME).dll

+LIB_NAME_IMP           = $(BASE_NAME).lib

+LIB_NAME_DLL_DEBUG     = $(BASE_NAME_DEBUG).dll

+LIB_NAME_IMP_DEBUG     = $(BASE_NAME_DEBUG).lib

+

+PDB_NAME_STATIC        = $(BASE_NAME_STATIC).pdb

+PDB_NAME_STATIC_DEBUG  = $(BASE_NAME_STATIC_DEBUG).pdb

+PDB_NAME_DLL           = $(BASE_NAME).pdb

+PDB_NAME_DLL_DEBUG     = $(BASE_NAME_DEBUG).pdb

 

 # CURL Command section

 PROGRAM_NAME = curl.exe

@@ -112,12 +124,10 @@ SSL_CFLAGS   = /DUSE_SSLEAY /I"$(DEVEL_INCLUDE)/openssl"
 

 !IF "$(WITH_ZLIB)"=="dll"

 ZLIB_LIBS   = zlib.lib

-ZLIB_CFLAGS = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ

 USE_ZLIB    = true

 ZLIB        = dll

 !ELSEIF "$(WITH_ZLIB)"=="static"

 ZLIB_LIBS   = zlib_a.lib

-ZLIB_CFLAGS = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ

 USE_ZLIB    = true

 ZLIB        = static

 !ENDIF

@@ -132,7 +142,7 @@ SSH2_LIBS   = libssh2.lib
 USE_SSH2    = true

 SSH2        = dll

 !ELSEIF "$(WITH_SSH2)"=="static"

-SSH2_LIBS   = libssh2_a_debug.lib

+SSH2_LIBS   = libssh2_a.lib user32.lib

 USE_SSH2    = true

 SSH2        = static

 !ENDIF

@@ -150,8 +160,8 @@ USE_IDN   = true
 !ENDIF

 

 !IF "$(USE_IDN)"=="true"

-CFLAGS    = $(CFLAGS) /DUSE_WIN32_IDN /DWANT_IDN_PROTOTYPES

-LFLAGS    = $(LFLAGS) Normaliz.lib

+IDN_CFLAGS = $(IDN_CFLAGS) /DUSE_WIN32_IDN /DWANT_IDN_PROTOTYPES

+WIN_LIBS   = $(WIN_LIBS) Normaliz.lib

 !ENDIF

 

 

@@ -198,6 +208,7 @@ USE_WINSSL  = $(USE_SSPI)
 USE_WINSSL  = true

 !ENDIF

 

+

 !IF "$(USE_WINSSL)"=="true"

 !IF "$(USE_SSPI)"!="true"

 !ERROR cannot build with WinSSL without SSPI

@@ -206,14 +217,10 @@ SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_SCHANNEL
 !ENDIF

 

 

-

 !IF "$(GEN_PDB)"=="yes"

 GEN_PDB = true

 !ENDIF

 

-!IFNDEF MACHINE

-MACHINE = X86

-!ENDIF

 

 !IFDEF EMBEND_MANIFEST

 MANIFESTTOOL = mt -manifest $(DIRDIST)\$(PROGRAM_NAME).manifest -outputresource:$(DIRDIST)\$(PROGRAM_NAME);1

@@ -240,12 +247,11 @@ AS_DLL = true
 CFGSET = true

 !ENDIF

 

-WIN_LIBS    = ws2_32.lib wldap32.lib advapi32.lib

 !IF "$(CFGSET)" == "FALSE"

 !ERROR please choose a valid mode

 !ENDIF

 

-CONFIG_NAME_LIB = libcurl

+

 

 # CURL_XX macros are for the curl.exe command

 

@@ -255,44 +261,44 @@ CC              = $(CC_DEBUG) $(RTLIB_DEBUG)
 

 CURL_CC         = $(CC)

 CURL_RC_FLAGS = /i../include /dDEBUGBUILD=1 /Fo $@ $(CURL_SRC_DIR)\curl.rc

-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-debug

 !ELSE

 RC_FLAGS = /dDEBUGBUILD=0 /Fo $@ $(LIBCURL_SRC_DIR)\libcurl.rc

 CC              = $(CC_NODEBUG) $(RTLIB)

 

 CURL_CC         = $(CC)

 CURL_RC_FLAGS = /i../include /dDEBUGBUILD=0 /Fo $@ $(CURL_SRC_DIR)\curl.rc

-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-release

 !ENDIF

 

 CURL_CC = $(CURL_CC) $(CURL_CFLAGS)

 

 !IF "$(AS_DLL)" == "true"

 

-LNK      = $(LNKDLL) $(WIN_LIBS) /out:$(LIB_DIROBJ)\$(TARGET)

+LNK       = $(LNKDLL) $(WIN_LIBS) /out:$(LIB_DIROBJ)\$(TARGET)

 !IF "$(DEBUG)"=="yes"

 TARGET    = $(LIB_NAME_DLL_DEBUG)

 LNK       = $(LNK) /DEBUG /IMPLIB:$(LIB_DIROBJ)\$(LIB_NAME_IMP_DEBUG)

+PDB       = $(PDB_NAME_DLL_DEBUG)

 CURL_LIBS = /IMPLIB:$(LIB_DIROBJ)\$(LIB_NAME_IMP_DEBUG)

 !ELSE

 TARGET    = $(LIB_NAME_DLL)

 LNK       = $(LNK)  /IMPLIB:$(LIB_DIROBJ)\$(LIB_NAME_IMP)

+PDB       = $(PDB_NAME_DLL)

 CURL_LIBS = /IMPLIB:$(LIB_DIROBJ)\$(LIB_NAME_IMP)

 !ENDIF

-RESOURCE = $(LIB_DIROBJ)\libcurl.res

-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-dll

+RESOURCE  = $(LIB_DIROBJ)\libcurl.res

 

 # AS_DLL

 !ELSE

 

 !IF "$(DEBUG)"=="yes"

 TARGET   = $(LIB_NAME_STATIC_DEBUG)

+PDB      = $(PDB_NAME_STATIC_DEBUG)

 !ELSE

 TARGET   = $(LIB_NAME_STATIC)

+PDB      = $(PDB_NAME_STATIC)

 !ENDIF

 LNK      = $(LNKLIB) $(WIN_LIBS) /out:$(LIB_DIROBJ)\$(TARGET)

 CC       = $(CC) $(CFLAGS_LIBCURL_STATIC)

-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-static

 

 # AS_DLL

 !ENDIF

@@ -300,42 +306,36 @@ CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-static
 !IF "$(USE_SSL)"=="true"

 CFLAGS = $(CFLAGS) $(SSL_CFLAGS)

 LFLAGS = $(LFLAGS) $(SSL_LFLAGS) $(SSL_LIBS)

-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ssl-$(SSL)

 !ENDIF

 

 !IF "$(USE_ZLIB)"=="true"

 CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS)

 LFLAGS = $(LFLAGS) $(ZLIB_LFLAGS) $(ZLIB_LIBS)

-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-zlib-$(ZLIB)

 !ENDIF

 

 !IF "$(USE_SSH2)"=="true"

 CFLAGS = $(CFLAGS) $(SSH2_CFLAGS)

 LFLAGS = $(LFLAGS) $(SSH2_LFLAGS) $(SSH2_LIBS)

-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ssh2-$(SSH2)

+!ENDIF

+

+!IF "$(USE_IDN)"=="true"

+CFLAGS = $(CFLAGS) $(IDN_CFLAGS)

 !ENDIF

 

 !IF "$(USE_IPV6)"=="true"

 CFLAGS = $(CFLAGS) $(IPV6_CFLAGS)

-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ipv6

 !ENDIF

 

 !IF "$(USE_SSPI)"=="true"

 CFLAGS = $(CFLAGS) $(SSPI_CFLAGS)

-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-sspi

 !ENDIF

 

 !IF "$(USE_SPNEGO)"=="true"

 CFLAGS = $(CFLAGS) $(SPNEGO_CFLAGS)

-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-spnego

-!ENDIF

-

-!IF "$(USE_WINSSL)"=="true"

-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-winssl

 !ENDIF

 

 !IF "$(GEN_PDB)"=="true"

-CFLAGS = $(CFLAGS) $(CFLAGS_PDB)

+CFLAGS = $(CFLAGS) $(CFLAGS_PDB) /Fd"$(LIB_DIROBJ)\$(PDB)"

 LFLAGS = $(LFLAGS) $(LFLAGS_PDB)

 !ENDIF

 

@@ -397,6 +397,7 @@ $(TARGET): $(LIB_OBJS) $(LIB_DIROBJ) $(DISTDIR)
 	@echo LFLAGS:     $(LFLAGS)

 	@echo GenPDB:     $(GEN_PDB)

 	@echo Debug:      $(DEBUG)

+	@echo Machine:    $(MACHINE)

 	$(LNK) $(LFLAGS) $(LIB_OBJS)

 	@echo Copying libs...

 	@if exist $(LIB_DIROBJ)\$(LIB_NAME_DLL) copy $(LIB_DIROBJ)\$(LIB_NAME_DLL)       $(DIRDIST)\bin\ /y >nul 2<&1

diff --git a/winbuild/gen_resp_file.bat b/winbuild/gen_resp_file.bat
index c2fa6677..d08b01ed 100755
--- a/winbuild/gen_resp_file.bat
+++ b/winbuild/gen_resp_file.bat
@@ -1,6 +1,6 @@
 @echo OFF

 @del %OUTFILE%

 @echo %MACRO_NAME% = \> %OUTFILE%

-@for %%i in (%*) do @echo		%LIBCURL_DIROBJ%/%%i \>>  %OUTFILE%

+@for %%i in (%*) do @echo		%DIROBJ%/%%i \>>  %OUTFILE%
 @echo. >>  %OUTFILE%

 :END