summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-10-10 13:39:08 +0200
committerBram Moolenaar <Bram@vim.org>2019-10-10 13:39:08 +0200
commit073e779640d089445c7289393db94d1ceb4ddb17 (patch)
treedb35c275e22da3e10b38d42b29abcf643fbd9783
parent1ac41a5c1352306942344777d2ba86dccd84ffad (diff)
downloadvim-git-073e779640d089445c7289393db94d1ceb4ddb17.tar.gz
patch 8.1.2130: MSVC build failsv8.1.2130
Problem: MSVC build fails. Solution: Add the source file name explicitly.
-rw-r--r--src/Make_mvc.mak18
-rw-r--r--src/version.c2
2 files changed, 11 insertions, 9 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index f867b3abd..2a0a1a1da 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -1744,31 +1744,31 @@ CCCTERM = $(CC) $(CFLAGS) -Ilibvterm/include -DINLINE="" \
-D_CRT_SECURE_NO_WARNINGS
$(OUTDIR)/vterm_encoding.obj: $(OUTDIR) libvterm/src/encoding.c $(TERM_DEPS)
- $(CCCTERM) /Fo$@ $<
+ $(CCCTERM) /Fo$@ libvterm/src/encoding.c
$(OUTDIR)/vterm_keyboard.obj: $(OUTDIR) libvterm/src/keyboard.c $(TERM_DEPS)
- $(CCCTERM) /Fo$@ $<
+ $(CCCTERM) /Fo$@ libvterm/src/keyboard.c
$(OUTDIR)/vterm_mouse.obj: $(OUTDIR) libvterm/src/mouse.c $(TERM_DEPS)
- $(CCCTERM) /Fo$@ $<
+ $(CCCTERM) /Fo$@ libvterm/src/mouse.c
$(OUTDIR)/vterm_parser.obj: $(OUTDIR) libvterm/src/parser.c $(TERM_DEPS)
- $(CCCTERM) /Fo$@ $<
+ $(CCCTERM) /Fo$@ libvterm/src/parser.c
$(OUTDIR)/vterm_pen.obj: $(OUTDIR) libvterm/src/pen.c $(TERM_DEPS)
- $(CCCTERM) /Fo$@ $<
+ $(CCCTERM) /Fo$@ libvterm/src/pen.c
$(OUTDIR)/vterm_screen.obj: $(OUTDIR) libvterm/src/screen.c $(TERM_DEPS)
- $(CCCTERM) /Fo$@ $<
+ $(CCCTERM) /Fo$@ libvterm/src/screen.c
$(OUTDIR)/vterm_state.obj: $(OUTDIR) libvterm/src/state.c $(TERM_DEPS)
- $(CCCTERM) /Fo$@ $<
+ $(CCCTERM) /Fo$@ libvterm/src/state.c
$(OUTDIR)/vterm_unicode.obj: $(OUTDIR) libvterm/src/unicode.c $(TERM_DEPS)
- $(CCCTERM) /Fo$@ $<
+ $(CCCTERM) /Fo$@ libvterm/src/unicode.c
$(OUTDIR)/vterm_vterm.obj: $(OUTDIR) libvterm/src/vterm.c $(TERM_DEPS)
- $(CCCTERM) /Fo$@ $<
+ $(CCCTERM) /Fo$@ libvterm/src/vterm.c
# $CFLAGS may contain backslashes and double quotes, escape them both.
diff --git a/src/version.c b/src/version.c
index f9a30285d..a0646485c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2130,
+/**/
2129,
/**/
2128,