New upstream version 7.67.0

2 files changed, 27 insertions, 9 deletions

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 9b3b3551..7ad49f09 100644
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -59,6 +59,7 @@ CFGSET=true
 !MESSAGE   ENABLE_WINSSL=<yes or no>      - Enable native Windows SSL support, defaults to yes
 !MESSAGE   ENABLE_OPENSSL_AUTO_LOAD_CONFIG=<yes or no>
 !MESSAGE                                  - Whether the OpenSSL configuration will be loaded automatically, defaults to yes
+!MESSAGE   ENABLE_UNICODE=<yes or no>     - Enable UNICODE support, defaults to no
 !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)
@@ -146,6 +147,14 @@ ENABLE_OPENSSL_AUTO_LOAD_CONFIG = true
 ENABLE_OPENSSL_AUTO_LOAD_CONFIG = false
 !ENDIF
 
+!IFNDEF ENABLE_UNICODE
+USE_UNICODE = false
+!ELSEIF "$(ENABLE_UNICODE)"=="yes"
+USE_UNICODE = true
+!ELSEIF "$(ENABLE_UNICODE)"=="no"
+USE_UNICODE = false
+!ENDIF
+
 CONFIG_NAME_LIB = libcurl
 
 !IF "$(WITH_SSL)"=="dll"
@@ -277,6 +286,7 @@ $(MODE):
 	@SET USE_IPV6=$(USE_IPV6)
 	@SET USE_SSPI=$(USE_SSPI)
 	@SET USE_WINSSL=$(USE_WINSSL)
+	@SET USE_UNICODE=$(USE_UNICODE)
 # compatibility bit
 	@SET WITH_NGHTTP2=$(WITH_NGHTTP2)
 
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index b5742e10..8267250c 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -393,11 +393,11 @@ CFGSET = true
 !IF "$(DEBUG)"=="yes"

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

 CURL_CC       = $(CC_DEBUG) $(RTLIB_DEBUG)

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

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

 !ELSE

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

 CURL_CC       = $(CC_NODEBUG) $(RTLIB)

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

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

 !ENDIF

 

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

@@ -485,14 +485,18 @@ LFLAGS = $(LFLAGS) $(LFLAGS_PDB)
 CFLAGS = $(CFLAGS) /DCURL_WITH_MULTI_SSL

 !ENDIF

 

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

+CFLAGS = $(CFLAGS) /DUNICODE /D_UNICODE

+!ENDIF

+

 LIB_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-lib

-CURL_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-curl
-
-!IFDEF WITH_PREFIX
-DIRDIST = $(WITH_PREFIX)
-!ELSE
-DIRDIST = ..\builds\$(CONFIG_NAME_LIB)\
-!ENDIF
+CURL_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-curl

+

+!IFDEF WITH_PREFIX

+DIRDIST = $(WITH_PREFIX)

+!ELSE

+DIRDIST = ..\builds\$(CONFIG_NAME_LIB)\

+!ENDIF

 

 #

 # curl.exe

@@ -559,6 +563,7 @@ $(LIB_DIROBJ):
 	@if not exist "$(LIB_DIROBJ)" mkdir $(LIB_DIROBJ)

 	@if not exist "$(LIB_DIROBJ)\vauth" mkdir $(LIB_DIROBJ)\vauth

 	@if not exist "$(LIB_DIROBJ)\vtls" mkdir $(LIB_DIROBJ)\vtls

+	@if not exist "$(LIB_DIROBJ)\vssh" mkdir $(LIB_DIROBJ)\vssh

 	@if not exist "$(LIB_DIROBJ)\vquic" mkdir $(LIB_DIROBJ)\vquic

 

 $(CURL_DIROBJ):

@@ -578,6 +583,9 @@ $(CURL_DIROBJ):
 {$(LIBCURL_SRC_DIR)\vtls\}.c{$(LIB_DIROBJ)\vtls\}.obj:

 	$(CURL_CC) $(CFLAGS) /Fo"$@"  $<

 

+{$(LIBCURL_SRC_DIR)\vssh\}.c{$(LIB_DIROBJ)\vssh\}.obj:

+	$(CURL_CC) $(CFLAGS) /Fo"$@"  $<

+

 {$(LIBCURL_SRC_DIR)\vquic\}.c{$(LIB_DIROBJ)\vquic\}.obj:

 	$(CURL_CC) $(CFLAGS) /Fo"$@"  $<