Mercurial > vim
comparison src/Make_cyg_ming.mak @ 18267:da6a7491e148 v8.1.2128
patch 8.1.2128: renamed libvterm sources makes merging difficult
Commit: https://github.com/vim/vim/commit/93268054428fe3a6bbe3f89d2def2fec4eabcf5f
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Oct 10 13:22:54 2019 +0200
patch 8.1.2128: renamed libvterm sources makes merging difficult
Problem: Renamed libvterm sources makes merging difficult.
Solution: Rename back to the original name and only rename the .o files.
Also clean the libvterm build artifacts. (James McCoy,
closes #5027)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 10 Oct 2019 13:30:04 +0200 |
parents | fe5afdc03bd2 |
children | 5ecefcbd12a1 |
comparison
equal
deleted
inserted
replaced
18266:4af19863e264 | 18267:da6a7491e148 |
---|---|
867 endif | 867 endif |
868 endif | 868 endif |
869 | 869 |
870 ifeq ($(TERMINAL),yes) | 870 ifeq ($(TERMINAL),yes) |
871 OBJ += $(OUTDIR)/terminal.o \ | 871 OBJ += $(OUTDIR)/terminal.o \ |
872 $(OUTDIR)/encoding.o \ | 872 $(OUTDIR)/vterm_encoding.o \ |
873 $(OUTDIR)/keyboard.o \ | 873 $(OUTDIR)/vterm_keyboard.o \ |
874 $(OUTDIR)/termmouse.o \ | 874 $(OUTDIR)/vterm_mouse.o \ |
875 $(OUTDIR)/parser.o \ | 875 $(OUTDIR)/vterm_parser.o \ |
876 $(OUTDIR)/pen.o \ | 876 $(OUTDIR)/vterm_pen.o \ |
877 $(OUTDIR)/termscreen.o \ | 877 $(OUTDIR)/vterm_screen.o \ |
878 $(OUTDIR)/state.o \ | 878 $(OUTDIR)/vterm_state.o \ |
879 $(OUTDIR)/unicode.o \ | 879 $(OUTDIR)/vterm_unicode.o \ |
880 $(OUTDIR)/vterm.o | 880 $(OUTDIR)/vterm_vterm.o |
881 endif | 881 endif |
882 | 882 |
883 ifeq ($(SOUND),yes) | 883 ifeq ($(SOUND),yes) |
884 OBJ += $(OUTDIR)/sound.o | 884 OBJ += $(OUTDIR)/sound.o |
885 endif | 885 endif |
1204 -DVSNPRINTF=vim_vsnprintf \ | 1204 -DVSNPRINTF=vim_vsnprintf \ |
1205 -DIS_COMBINING_FUNCTION=utf_iscomposing_uint \ | 1205 -DIS_COMBINING_FUNCTION=utf_iscomposing_uint \ |
1206 -DWCWIDTH_FUNCTION=utf_uint2cells \ | 1206 -DWCWIDTH_FUNCTION=utf_uint2cells \ |
1207 -DGET_SPECIAL_PTY_TYPE_FUNCTION=get_special_pty_type | 1207 -DGET_SPECIAL_PTY_TYPE_FUNCTION=get_special_pty_type |
1208 | 1208 |
1209 $(OUTDIR)/%.o : libvterm/src/%.c $(TERM_DEPS) | 1209 $(OUTDIR)/vterm_%.o : libvterm/src/%.c $(TERM_DEPS) |
1210 $(CCCTERM) $< -o $@ | 1210 $(CCCTERM) $< -o $@ |
1211 | 1211 |
1212 | 1212 |
1213 $(OUTDIR)/%.o : xdiff/%.c $(XDIFF_DEPS) | 1213 $(OUTDIR)/%.o : xdiff/%.c $(XDIFF_DEPS) |
1214 $(CC) -c $(CFLAGS) $< -o $@ | 1214 $(CC) -c $(CFLAGS) $< -o $@ |