[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 367/411: Makefile.m32: add support for UNICODE builds
From: |
gnunet |
Subject: |
[gnurl] 367/411: Makefile.m32: add support for UNICODE builds |
Date: |
Wed, 13 Jan 2021 01:23:02 +0100 |
This is an automated email from the git hooks/post-receive script.
nikita pushed a commit to branch master
in repository gnurl.
commit 3e092adf673ead8b25167df9583ac6ac1ba77261
Author: Viktor Szakats <commit@vsz.me>
AuthorDate: Mon Nov 23 16:56:27 2020 +0000
Makefile.m32: add support for UNICODE builds
It requires the linker to support the `-municode` option.
This is available in more recent mingw-w64 releases.
Ref: https://gcc.gnu.org/onlinedocs/gcc/x86-Windows-Options.html
Ref:
https://stackoverflow.com/questions/3571250/wwinmain-unicode-and-mingw/11706847#11706847
Reviewed-by: Jay Satiro
Reviewed-by: Marcel Raad
Closes #6228
---
lib/Makefile.m32 | 6 ++++++
src/Makefile.m32 | 7 +++++++
2 files changed, 13 insertions(+)
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 3463dee20..d23eeead3 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -226,6 +226,9 @@ endif
ifeq ($(findstring -ngtcp2,$(CFG)),-ngtcp2)
NGTCP2 = 1
endif
+ifeq ($(findstring -unicode,$(CFG)),-unicode)
+UNICODE = 1
+endif
INCLUDES = -I. -I../include
CFLAGS += -DBUILDING_LIBCURL
@@ -234,6 +237,9 @@ ifdef SSL
CFLAGS += -DCURL_WITH_MULTI_SSL
endif
endif
+ifdef UNICODE
+ CFLAGS += -DUNICODE -D_UNICODE
+endif
ifdef SYNC
CFLAGS += -DUSE_SYNC_DNS
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index ba74fe157..03c2b676c 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -238,6 +238,9 @@ endif
ifeq ($(findstring -ngtcp2,$(CFG)),-ngtcp2)
NGTCP2 = 1
endif
+ifeq ($(findstring -unicode,$(CFG)),-unicode)
+UNICODE = 1
+endif
INCLUDES = -I. -I../include -I../lib
ifdef SSL
@@ -245,6 +248,10 @@ ifdef SSL
CFLAGS += -DCURL_WITH_MULTI_SSL
endif
endif
+ifdef UNICODE
+ CFLAGS += -DUNICODE -D_UNICODE
+ LDFLAGS += -municode
+endif
ifdef DYN
curl_DEPENDENCIES = $(PROOT)/lib/libcurldll.a $(PROOT)/lib/libcurl.dll
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnurl] 338/411: httpput-postfields.c: new example doing PUT with POSTFIELDS, (continued)
- [gnurl] 338/411: httpput-postfields.c: new example doing PUT with POSTFIELDS, gnunet, 2021/01/12
- [gnurl] 276/411: CI/github: work-around for brew breakage on macOS, gnunet, 2021/01/12
- [gnurl] 303/411: RELEASE-NOTES: synced, gnunet, 2021/01/12
- [gnurl] 293/411: gnutls: fix memory leaks (certfields memory wasn't released), gnunet, 2021/01/12
- [gnurl] 316/411: examples: fix comment syntax, gnunet, 2021/01/12
- [gnurl] 283/411: CMake: make BUILD_TESTING dependent option, gnunet, 2021/01/12
- [gnurl] 337/411: cmake: correctly handle linker flags for static libs, gnunet, 2021/01/12
- [gnurl] 291/411: tool_operate: --retry for HTTP 408 responses too, gnunet, 2021/01/12
- [gnurl] 361/411: RELEASE-NOTES: synced, gnunet, 2021/01/12
- [gnurl] 315/411: hsts: Remove pointless call to free in errorpath, gnunet, 2021/01/12
- [gnurl] 367/411: Makefile.m32: add support for UNICODE builds,
gnunet <=
- [gnurl] 285/411: configure: use pkgconfig to find openSSL when cross-compiling, gnunet, 2021/01/12
- [gnurl] 354/411: cmake: make CURL_ZLIB a tri-state variable, gnunet, 2021/01/12
- [gnurl] 357/411: mailmap: Daniel Hwang, gnunet, 2021/01/12
- [gnurl] 265/411: CMake: store IDN2 information in curl_config.h, gnunet, 2021/01/12
- [gnurl] 351/411: KNOWN_BUGS: cmake autodetects cert paths when cross-compiling, gnunet, 2021/01/12
- [gnurl] 222/411: build-wolfssl: fix build with Visual Studio 2019, gnunet, 2021/01/12
- [gnurl] 202/411: src: Consistently spell whitespace without whitespace, gnunet, 2021/01/12
- [gnurl] 224/411: RELEASE-NOTES: synced, gnunet, 2021/01/12
- [gnurl] 277/411: range.d: fix typo, gnunet, 2021/01/12
- [gnurl] 296/411: sendf: move the verbose-check into Curl_debug, gnunet, 2021/01/12