Skip to content

Commit 3c5443e

Browse files
committed
Add unicode linker flags
* templates/bmake.mpd: * templates/bmakecommon.mpt:
1 parent bd652b0 commit 3c5443e

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

templates/bmake.mpd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
CC = <%cc%>
1212
OPTIMIZE_CFLAGS = <%optimize_flags%>
1313
UNICODE_CFLAGS = <%unicode_flags%>
14+
UNICODE_LFLAGS = <%unicode_linker_flags%>
1415
PDB_FLAGS = <%pdb_flags%>
1516
DEBUG_CFLAGS = <%debug_flags%>
1617
RELEASE_CFLAGS = <%release_flags%>
@@ -80,6 +81,7 @@ EXEOUTPUTDIR = <%if(exeout)%><%exeout%><%if(windows_style)%>\<%output_dir("Debug
8081

8182
!ifdef UNICODE
8283
UC_CFLAGS = $(UNICODE_CFLAGS)
84+
UC_LFLAGS = $(UNICODE_LFLAGS)
8385
UNICODE_DIR = Unicode\\
8486
UC_MAIN = w
8587
ULIBMODIFIER = <%unicode_lib_modifier%>

templates/bmakecommon.mpt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ debug_flags = -g -O0
116116
release_flags = -Wno-ignored-attributes
117117
optimize_flags = -O3
118118
unicode_flags = -tU
119+
unicode_linker_flags = -tU
119120
debug_ext = .pdb
120121
pdb_flags = -Xlinker -pdb -Xlinker $(OUTPUTDIR:\=/)$(NAME).$(DEBUG_EXT)
121122
warn_flags =
@@ -138,6 +139,6 @@ tlib = tlib64
138139
dllflags = -tD -tR
139140
exeflags = -tR
140141
object_search_path = 0
141-
linker_dll_arguments = --driver-mode=g++ $(DLLFLAGS) $(LFLAGS:\=/) $(OBJFILES:\=/) -o $(OUTPUTDIR:\=/)$(NAME)$(DLL_EXT) -Xlinker --out-implib -Xlinker $(OUTPUTDIR:\=/)$(NAME).lib $(LIBFILES:\=/) $(RESOURCE:\=/)
142-
linker_exe_arguments = --driver-mode=g++ $(EXEFLAGS) $(LFLAGS:\=/) $(OBJFILES:\=/) -o $(OUTPUTDIR:\=/)$(NAME)$(EXE_EXT) $(LIBFILES:\=/) $(RESOURCE:\=/)
142+
linker_dll_arguments = --driver-mode=g++ $(DLLFLAGS) $(UC_LFLAGS) $(LFLAGS:\=/) $(OBJFILES:\=/) -o $(OUTPUTDIR:\=/)$(NAME)$(DLL_EXT) -Xlinker --out-implib -Xlinker $(OUTPUTDIR:\=/)$(NAME).lib $(LIBFILES:\=/) $(RESOURCE:\=/)
143+
linker_exe_arguments = --driver-mode=g++ $(EXEFLAGS) $(UC_LFLAGS) $(LFLAGS:\=/) $(OBJFILES:\=/) -o $(OUTPUTDIR:\=/)$(NAME)$(EXE_EXT) $(LIBFILES:\=/) $(RESOURCE:\=/)
143144
}

0 commit comments

Comments
 (0)