[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 142/222: winbuild: add ENABLE_UNICODE option
From: |
gnunet |
Subject: |
[gnurl] 142/222: winbuild: add ENABLE_UNICODE option |
Date: |
Thu, 07 Nov 2019 00:10:38 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 1d7fe8390f01295e725be3b9e6840e4828da07e2
Author: apique <address@hidden>
AuthorDate: Mon Sep 9 17:06:15 2019 +0200
winbuild: add ENABLE_UNICODE option
Fixes https://github.com/curl/curl/issues/4308
Closes https://github.com/curl/curl/pull/4309
---
winbuild/Makefile.vc | 10 ++++++++++
winbuild/MakefileBuild.vc | 4 ++++
2 files changed, 14 insertions(+)
diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 9b3b35513..7ad49f09f 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 5cc16501b..8267250c2 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -485,6 +485,10 @@ 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
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnurl] 120/222: altsvc: accept quoted ma and persist values, (continued)
- [gnurl] 120/222: altsvc: accept quoted ma and persist values, gnunet, 2019/11/06
- [gnurl] 124/222: lib: silence conversion warnings, gnunet, 2019/11/06
- [gnurl] 113/222: cookies: using a share with cookies shouldn't enable the cookie engine, gnunet, 2019/11/06
- [gnurl] 126/222: checksrc: fix uninitialized variable warning, gnunet, 2019/11/06
- [gnurl] 117/222: BINDINGS: PureBasic, Net::Curl for perl and Nim, gnunet, 2019/11/06
- [gnurl] 133/222: RELEASE-NOTES: synced, gnunet, 2019/11/06
- [gnurl] 134/222: ESNI: initial build/setup, gnunet, 2019/11/06
- [gnurl] 135/222: CURLMOPT_MAX_CONCURRENT_STREAMS.3: fix SEE ALSO typo, gnunet, 2019/11/06
- [gnurl] 141/222: ngtcp2: adapt to API change, gnunet, 2019/11/06
- [gnurl] 140/222: cookies: change argument type for Curl_flush_cookies, gnunet, 2019/11/06
- [gnurl] 142/222: winbuild: add ENABLE_UNICODE option,
gnunet <=
- [gnurl] 145/222: build: Remove unused HAVE_LIBSSL and HAVE_LIBCRYPTO defines, gnunet, 2019/11/06
- [gnurl] 151/222: cirrus: Switch the FreeBSD 11.x build to 11.3 and add a 13.0 build., gnunet, 2019/11/06
- [gnurl] 148/222: CURLOPT_TIMEOUT.3: remove the mention of "minutes", gnunet, 2019/11/06
- [gnurl] 143/222: curl: ensure HTTP 429 triggers --retry, gnunet, 2019/11/06
- [gnurl] 149/222: TODO: Consult %APPDATA% also for .netrc, gnunet, 2019/11/06
- [gnurl] 146/222: ldap: fix OOM error on missing query string, gnunet, 2019/11/06
- [gnurl] 138/222: urlapi: fix use-after-free bug, gnunet, 2019/11/06
- [gnurl] 153/222: docs: make sure the --no-progress-meter docs file is in dist too, gnunet, 2019/11/06
- [gnurl] 154/222: cirrus: Increase the git clone depth., gnunet, 2019/11/06
- [gnurl] 152/222: docs: document it as --no-progress-meter instead of the reverse, gnunet, 2019/11/06