moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-15 05:55:04 -05:00
Code Issues Releases Wiki Activity

Makefile.m32: add support for UNICODE builds

Browse Source 
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
This commit is contained in:
Viktor Szakats 2020-11-23 16:56:27 +00:00
parent a95a6ce6b8
commit 3e092adf67
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Makefile.m32
View File

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

7
src/Makefile.m32
View File

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