comparison src/Make_cyg_ming.mak @ 12210:b9b06aa0b6d9 v8.0.0985

patch 8.0.0985: libvterm has its own idea of character width commit https://github.com/vim/vim/commit/6d0826dfbba9880820d9ec221327e4250bbf6540 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Aug 22 22:12:17 2017 +0200 patch 8.0.0985: libvterm has its own idea of character width 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)
author Christian Brabandt <cb@256bit.org>
date Tue, 22 Aug 2017 22:15:04 +0200
parents 112427b2de52
children cd366d80d53e
comparison
equal deleted inserted replaced
12209:71f25f291349 12210:b9b06aa0b6d9
969 969
970 $(OUTDIR)/terminal.o: terminal.c $(INCL) $(TERM_DEPS) 970 $(OUTDIR)/terminal.o: terminal.c $(INCL) $(TERM_DEPS)
971 $(CC) -c $(CFLAGS) terminal.c -o $(OUTDIR)/terminal.o 971 $(CC) -c $(CFLAGS) terminal.c -o $(OUTDIR)/terminal.o
972 972
973 973
974 CCCTERM = $(CC) -c $(CFLAGS) -Ilibvterm/include -DINLINE="" -DVSNPRINTF=vim_vsnprintf 974 CCCTERM = $(CC) -c $(CFLAGS) -Ilibvterm/include -DINLINE="" \
975 -DVSNPRINTF=vim_vsnprintf \
976 -DIS_COMBINING_FUNCTION=utf_iscomposing_uint \
977 -DWCWIDTH_FUNCTION=utf_uint2cells
978
975 $(OUTDIR)/term_encoding.o: libvterm/src/encoding.c $(TERM_DEPS) 979 $(OUTDIR)/term_encoding.o: libvterm/src/encoding.c $(TERM_DEPS)
976 $(CCCTERM) libvterm/src/encoding.c -o $@ 980 $(CCCTERM) libvterm/src/encoding.c -o $@
977 981
978 $(OUTDIR)/term_keyboard.o: libvterm/src/keyboard.c $(TERM_DEPS) 982 $(OUTDIR)/term_keyboard.o: libvterm/src/keyboard.c $(TERM_DEPS)
979 $(CCCTERM) libvterm/src/keyboard.c -o $@ 983 $(CCCTERM) libvterm/src/keyboard.c -o $@