Mercurial > vim

comparison src/Make_cyg_ming.mak @ 14734:2c72fa16aa70 v8.1.0379

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0379: build dependencies are incomplete commit https://github.com/vim/vim/commit/78dcd4f002c41fff9c15434336f57210edc384f2 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Sep 13 17:23:28 2018 +0200 patch 8.1.0379: build dependencies are incomplete Problem: Build dependencies are incomplete. Solution: Update the build dependencies, mainly for xdiff. Adjust object directory for libvterm and xdiff.
author Christian Brabandt <cb@256bit.org>
date Thu, 13 Sep 2018 17:30:05 +0200
parents 195e8b1fcbbf
children 7968031aeaa3
comparison
equal deleted inserted replaced
14733:15d60eacdbc8 14734:2c72fa16aa70
816 endif 816 endif
817 endif 817 endif
818 818
819 ifeq ($(TERMINAL),yes) 819 ifeq ($(TERMINAL),yes)
820 OBJ += $(OUTDIR)/terminal.o \ 820 OBJ += $(OUTDIR)/terminal.o \
821 $(OUTDIR)/term_encoding.o \ 821 $(OUTDIR)/encoding.o \
822 $(OUTDIR)/term_keyboard.o \ 822 $(OUTDIR)/keyboard.o \
823 $(OUTDIR)/term_mouse.o \ 823 $(OUTDIR)/mouse.o \
824 $(OUTDIR)/term_parser.o \ 824 $(OUTDIR)/parser.o \
825 $(OUTDIR)/term_pen.o \ 825 $(OUTDIR)/pen.o \
826 $(OUTDIR)/term_screen.o \ 826 $(OUTDIR)/termscreen.o \
827 $(OUTDIR)/term_state.o \ 827 $(OUTDIR)/state.o \
828 $(OUTDIR)/term_unicode.o \ 828 $(OUTDIR)/unicode.o \
829 $(OUTDIR)/term_vterm.o 829 $(OUTDIR)/vterm.o
830 endif 830 endif
831 831
832 # Include xdiff 832 # Include xdiff
833 OBJ += $(OUTDIR)/xdiffi.o \ 833 OBJ += $(OUTDIR)/xdiffi.o \
834 $(OUTDIR)/xemit.o \ 834 $(OUTDIR)/xemit.o \
1062 CCCTERM = $(CC) -c $(CFLAGS) -Ilibvterm/include -DINLINE="" \ 1062 CCCTERM = $(CC) -c $(CFLAGS) -Ilibvterm/include -DINLINE="" \
1063 -DVSNPRINTF=vim_vsnprintf \ 1063 -DVSNPRINTF=vim_vsnprintf \
1064 -DIS_COMBINING_FUNCTION=utf_iscomposing_uint \ 1064 -DIS_COMBINING_FUNCTION=utf_iscomposing_uint \
1065 -DWCWIDTH_FUNCTION=utf_uint2cells 1065 -DWCWIDTH_FUNCTION=utf_uint2cells
1066 1066
1067 $(OUTDIR)/term_encoding.o: libvterm/src/encoding.c $(TERM_DEPS) 1067 $(OUTDIR)/encoding.o: libvterm/src/encoding.c $(TERM_DEPS)
1068 $(CCCTERM) libvterm/src/encoding.c -o $@ 1068 $(CCCTERM) libvterm/src/encoding.c -o $@
1069 1069
1070 $(OUTDIR)/term_keyboard.o: libvterm/src/keyboard.c $(TERM_DEPS) 1070 $(OUTDIR)/keyboard.o: libvterm/src/keyboard.c $(TERM_DEPS)
1071 $(CCCTERM) libvterm/src/keyboard.c -o $@ 1071 $(CCCTERM) libvterm/src/keyboard.c -o $@
1072 1072
1073 $(OUTDIR)/term_mouse.o: libvterm/src/mouse.c $(TERM_DEPS) 1073 $(OUTDIR)/mouse.o: libvterm/src/mouse.c $(TERM_DEPS)
1074 $(CCCTERM) libvterm/src/mouse.c -o $@ 1074 $(CCCTERM) libvterm/src/mouse.c -o $@
1075 1075
1076 $(OUTDIR)/term_parser.o: libvterm/src/parser.c $(TERM_DEPS) 1076 $(OUTDIR)/parser.o: libvterm/src/parser.c $(TERM_DEPS)
1077 $(CCCTERM) libvterm/src/parser.c -o $@ 1077 $(CCCTERM) libvterm/src/parser.c -o $@
1078 1078
1079 $(OUTDIR)/term_pen.o: libvterm/src/pen.c $(TERM_DEPS) 1079 $(OUTDIR)/pen.o: libvterm/src/pen.c $(TERM_DEPS)
1080 $(CCCTERM) libvterm/src/pen.c -o $@ 1080 $(CCCTERM) libvterm/src/pen.c -o $@
1081 1081
1082 $(OUTDIR)/term_screen.o: libvterm/src/screen.c $(TERM_DEPS) 1082 $(OUTDIR)/termscreen.o: libvterm/src/termscreen.c $(TERM_DEPS)
1083 $(CCCTERM) libvterm/src/screen.c -o $@ 1083 $(CCCTERM) libvterm/src/termscreen.c -o $@
1084 1084
1085 $(OUTDIR)/term_state.o: libvterm/src/state.c $(TERM_DEPS) 1085 $(OUTDIR)/state.o: libvterm/src/state.c $(TERM_DEPS)
1086 $(CCCTERM) libvterm/src/state.c -o $@ 1086 $(CCCTERM) libvterm/src/state.c -o $@
1087 1087
1088 $(OUTDIR)/term_unicode.o: libvterm/src/unicode.c $(TERM_DEPS) 1088 $(OUTDIR)/unicode.o: libvterm/src/unicode.c $(TERM_DEPS)
1089 $(CCCTERM) libvterm/src/unicode.c -o $@ 1089 $(CCCTERM) libvterm/src/unicode.c -o $@
1090 1090
1091 $(OUTDIR)/term_vterm.o: libvterm/src/vterm.c $(TERM_DEPS) 1091 $(OUTDIR)/vterm.o: libvterm/src/vterm.c $(TERM_DEPS)
1092 $(CCCTERM) libvterm/src/vterm.c -o $@ 1092 $(CCCTERM) libvterm/src/vterm.c -o $@
1093 1093
1094 $(OUTDIR)/xdiffi.o: xdiff/xdiffi.c $(XDIFF_DEPS) 1094 $(OUTDIR)/xdiffi.o: xdiff/xdiffi.c $(XDIFF_DEPS)
1095 $(CC) -c $(CFLAGS) xdiff/xdiffi.c -o $(OUTDIR)/xdiffi.o 1095 $(CC) -c $(CFLAGS) xdiff/xdiffi.c -o $(OUTDIR)/xdiffi.o
1096 1096