Mercurial > vim

comparison src/Make_mvc.mak @ 18267:da6a7491e148 v8.1.2128

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 b506809f5d38
comparison
equal deleted inserted replaced
18266:4af19863e264 18267:da6a7491e148
361 !endif 361 !endif
362 362
363 !if "$(TERMINAL)" == "yes" 363 !if "$(TERMINAL)" == "yes"
364 TERM_OBJ = \ 364 TERM_OBJ = \
365 $(OBJDIR)/terminal.obj \ 365 $(OBJDIR)/terminal.obj \
366 $(OBJDIR)/encoding.obj \ 366 $(OBJDIR)/vterm_encoding.obj \
367 $(OBJDIR)/keyboard.obj \ 367 $(OBJDIR)/vterm_keyboard.obj \
368 $(OBJDIR)/termmouse.obj \ 368 $(OBJDIR)/vterm_mouse.obj \
369 $(OBJDIR)/parser.obj \ 369 $(OBJDIR)/vterm_parser.obj \
370 $(OBJDIR)/pen.obj \ 370 $(OBJDIR)/vterm_pen.obj \
371 $(OBJDIR)/termscreen.obj \ 371 $(OBJDIR)/vterm_screen.obj \
372 $(OBJDIR)/state.obj \ 372 $(OBJDIR)/vterm_state.obj \
373 $(OBJDIR)/unicode.obj \ 373 $(OBJDIR)/vterm_unicode.obj \
374 $(OBJDIR)/vterm.obj 374 $(OBJDIR)/vterm_vterm.obj
375 TERM_DEFS = -DFEAT_TERMINAL 375 TERM_DEFS = -DFEAT_TERMINAL
376 TERM_DEPS = \ 376 TERM_DEPS = \
377 libvterm/include/vterm.h \ 377 libvterm/include/vterm.h \
378 libvterm/include/vterm_keycodes.h \ 378 libvterm/include/vterm_keycodes.h \
379 libvterm/src/rect.h \ 379 libvterm/src/rect.h \
1741 -DIS_COMBINING_FUNCTION=utf_iscomposing_uint \ 1741 -DIS_COMBINING_FUNCTION=utf_iscomposing_uint \
1742 -DWCWIDTH_FUNCTION=utf_uint2cells \ 1742 -DWCWIDTH_FUNCTION=utf_uint2cells \
1743 -DGET_SPECIAL_PTY_TYPE_FUNCTION=get_special_pty_type \ 1743 -DGET_SPECIAL_PTY_TYPE_FUNCTION=get_special_pty_type \
1744 -D_CRT_SECURE_NO_WARNINGS 1744 -D_CRT_SECURE_NO_WARNINGS
1745 1745
1746 # Create a default rule for libvterm. 1746 $(OUTDIR)/vterm_encoding.obj: $(OUTDIR) libvterm/src/encoding.c $(TERM_DEPS)
1747 {libvterm/src/}.c{$(OUTDIR)/}.obj:: 1747 $(CCCTERM) /Fo$@ $<
1748 $(CCCTERM) -Fo$(OUTDIR)/ $< 1748
1749 1749 $(OUTDIR)/vterm_keyboard.obj: $(OUTDIR) libvterm/src/keyboard.c $(TERM_DEPS)
1750 $(OUTDIR)/encoding.obj: $(OUTDIR) libvterm/src/encoding.c $(TERM_DEPS) 1750 $(CCCTERM) /Fo$@ $<
1751 1751
1752 $(OUTDIR)/keyboard.obj: $(OUTDIR) libvterm/src/keyboard.c $(TERM_DEPS) 1752 $(OUTDIR)/vterm_mouse.obj: $(OUTDIR) libvterm/src/mouse.c $(TERM_DEPS)
1753 1753 $(CCCTERM) /Fo$@ $<
1754 $(OUTDIR)/termmouse.obj: $(OUTDIR) libvterm/src/termmouse.c $(TERM_DEPS) 1754
1755 1755 $(OUTDIR)/vterm_parser.obj: $(OUTDIR) libvterm/src/parser.c $(TERM_DEPS)
1756 $(OUTDIR)/parser.obj: $(OUTDIR) libvterm/src/parser.c $(TERM_DEPS) 1756 $(CCCTERM) /Fo$@ $<
1757 1757
1758 $(OUTDIR)/pen.obj: $(OUTDIR) libvterm/src/pen.c $(TERM_DEPS) 1758 $(OUTDIR)/vterm_pen.obj: $(OUTDIR) libvterm/src/pen.c $(TERM_DEPS)
1759 1759 $(CCCTERM) /Fo$@ $<
1760 $(OUTDIR)/termscreen.obj: $(OUTDIR) libvterm/src/termscreen.c $(TERM_DEPS) 1760
1761 1761 $(OUTDIR)/vterm_screen.obj: $(OUTDIR) libvterm/src/screen.c $(TERM_DEPS)
1762 $(OUTDIR)/state.obj: $(OUTDIR) libvterm/src/state.c $(TERM_DEPS) 1762 $(CCCTERM) /Fo$@ $<
1763 1763
1764 $(OUTDIR)/unicode.obj: $(OUTDIR) libvterm/src/unicode.c $(TERM_DEPS) 1764 $(OUTDIR)/vterm_state.obj: $(OUTDIR) libvterm/src/state.c $(TERM_DEPS)
1765 1765 $(CCCTERM) /Fo$@ $<
1766 $(OUTDIR)/vterm.obj: $(OUTDIR) libvterm/src/vterm.c $(TERM_DEPS) 1766
1767 $(OUTDIR)/vterm_unicode.obj: $(OUTDIR) libvterm/src/unicode.c $(TERM_DEPS)
1768 $(CCCTERM) /Fo$@ $<
1769
1770 $(OUTDIR)/vterm_vterm.obj: $(OUTDIR) libvterm/src/vterm.c $(TERM_DEPS)
1771 $(CCCTERM) /Fo$@ $<
1767 1772
1768 1773
1769 # $CFLAGS may contain backslashes and double quotes, escape them both. 1774 # $CFLAGS may contain backslashes and double quotes, escape them both.
1770 E0_CFLAGS = $(CFLAGS:\=\\) 1775 E0_CFLAGS = $(CFLAGS:\=\\)
1771 E_CFLAGS = $(E0_CFLAGS:"=\") 1776 E_CFLAGS = $(E0_CFLAGS:"=\")