Skip to content

Commit 93967a5

Browse files
jwillemsenmergify[bot]
authored andcommitted
Use inlining also in a debug build
* ACE/bin/MakeProjectCreator/config/acedefaults.mpb: (cherry picked from commit 6c26ad0) # Conflicts: # ACE/bin/MakeProjectCreator/config/acedefaults.mpb
1 parent 4d74f4c commit 93967a5

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

ACE/bin/MakeProjectCreator/config/acedefaults.mpb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ project: ipv6, vc_warnings, build_files, test_files, svc_conf_files, ace_unicode
44
includes += $(ACE_ROOT)
55
libpaths += $(ACE_ROOT)/lib
66

7+
<<<<<<< HEAD
8+
=======
9+
// Support the alternative Borland Make project type
10+
specific(bmake) {
11+
unicode_flags += -DACE_USES_WCHAR
12+
}
13+
>>>>>>> 6c26ad0255 (Use inlining also in a debug build)
714

815
specific(prop:microsoft) {
916
macro_for_lib_modifier=1

0 commit comments

Comments
 (0)