From: Viktor Szakats <commit@vsz.me>
Date: Mon, 23 Nov 2020 16:56:27 +0000 (+0000)
Subject: Makefile.m32: add support for UNICODE builds
X-Git-Tag: curl-7_74_0~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e092adf673ead8b25167df9583ac6ac1ba77261;p=thirdparty%2Fcurl.git

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
---

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 3463dee20f..d23eeead3b 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 ba74fe157e..03c2b676c7 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