diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-10-10 13:22:54 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-10-10 13:22:54 +0200 |
| commit | 93268054428fe3a6bbe3f89d2def2fec4eabcf5f (patch) | |
| tree | d8e0be653481f2f7010d3218e1e0181801aaeefc /src/Make_cyg_ming.mak | |
| parent | 14c01f83487d5c53192297a710eda2b8a4ab17c9 (diff) | |
patch 8.1.2128: renamed libvterm sources makes merging difficultv8.1.2128
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)
Diffstat (limited to 'src/Make_cyg_ming.mak')
| -rw-r--r-- | src/Make_cyg_ming.mak | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index f04d11b188..24c1338504 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -869,15 +869,15 @@ endif ifeq ($(TERMINAL),yes) OBJ += $(OUTDIR)/terminal.o \ - $(OUTDIR)/encoding.o \ - $(OUTDIR)/keyboard.o \ - $(OUTDIR)/termmouse.o \ - $(OUTDIR)/parser.o \ - $(OUTDIR)/pen.o \ - $(OUTDIR)/termscreen.o \ - $(OUTDIR)/state.o \ - $(OUTDIR)/unicode.o \ - $(OUTDIR)/vterm.o + $(OUTDIR)/vterm_encoding.o \ + $(OUTDIR)/vterm_keyboard.o \ + $(OUTDIR)/vterm_mouse.o \ + $(OUTDIR)/vterm_parser.o \ + $(OUTDIR)/vterm_pen.o \ + $(OUTDIR)/vterm_screen.o \ + $(OUTDIR)/vterm_state.o \ + $(OUTDIR)/vterm_unicode.o \ + $(OUTDIR)/vterm_vterm.o endif ifeq ($(SOUND),yes) @@ -1206,7 +1206,7 @@ CCCTERM = $(CC) -c $(CFLAGS) -Ilibvterm/include -DINLINE="" \ -DWCWIDTH_FUNCTION=utf_uint2cells \ -DGET_SPECIAL_PTY_TYPE_FUNCTION=get_special_pty_type -$(OUTDIR)/%.o : libvterm/src/%.c $(TERM_DEPS) +$(OUTDIR)/vterm_%.o : libvterm/src/%.c $(TERM_DEPS) $(CCCTERM) $< -o $@ |