diff options
| author | Viktor Szakats <commit@vsz.me> | 2020-11-23 16:56:27 +0000 |
|---|---|---|
| committer | Viktor Szakats <commit@vsz.me> | 2020-11-23 16:56:27 +0000 |
| commit | 3e092adf673ead8b25167df9583ac6ac1ba77261 (patch) | |
| tree | 31b0f73587b954745e4a2e53179bc97d333a2df0 | |
| parent | a95a6ce6b809693a1195e3b4347a6cfa0fbc2ee7 (diff) | |
| download | curl-3e092adf673ead8b25167df9583ac6ac1ba77261.tar.gz | |
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
| -rw-r--r-- | lib/Makefile.m32 | 6 | ||||
| -rw-r--r-- | src/Makefile.m32 | 7 |
2 files changed, 13 insertions, 0 deletions
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 |