diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-08-22 22:12:17 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-08-22 22:12:17 +0200 |
| commit | 6d0826dfbba9880820d9ec221327e4250bbf6540 (patch) | |
| tree | 4cc32379c4c21b3dfced4bc8339d8541188cf18f /src/Make_mvc.mak | |
| parent | 5830232c021102e47a4e6fc81857604e4a031ddf (diff) | |
patch 8.0.0985: libvterm has its own idea of character widthv8.0.0985
Problem: Libvterm has its own idea of character width.
Solution: Use the Vim functions for character width and composing to avoid a
mismatch. (idea by Yasuhiro Matsumoto)
Diffstat (limited to 'src/Make_mvc.mak')
| -rw-r--r-- | src/Make_mvc.mak | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index d1221d0f0a..4180b7c76f 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -1474,7 +1474,12 @@ $(OUTDIR)/dimm_i.obj: $(OUTDIR) dimm_i.c $(INCL) $(OUTDIR)/glbl_ime.obj: $(OUTDIR) glbl_ime.cpp dimm.h $(INCL) -CCCTERM = $(CC) $(CFLAGS) -Ilibvterm/include -DINLINE="" -DVSNPRINTF=vim_vsnprintf -D_CRT_SECURE_NO_WARNINGS +CCCTERM = $(CC) $(CFLAGS) -Ilibvterm/include -DINLINE="" \ + -DVSNPRINTF=vim_vsnprintf \ + -DIS_COMBINING_FUNCTION=utf_iscomposing_uint \ + -DWCWIDTH_FUNCTION=utf_uint2cells \ + -D_CRT_SECURE_NO_WARNINGS + $(OUTDIR)/term_encoding.obj: $(OUTDIR) libvterm/src/encoding.c $(TERM_DEPS) $(CCCTERM) -Fo$@ libvterm/src/encoding.c |