diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-05-24 17:17:54 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-05-24 17:17:54 +0200 |
commit | d22a6f8aaf4dbffc9254965e39e031914dbc495a (patch) | |
tree | b3dd126f44df794da5a0d61d2ff8170864a03943 | |
parent | fa8f861957f4f9f7a0946d9d61fe90a9882f54e6 (diff) | |
download | vim-git-8.1.1381.tar.gz |
patch 8.1.1381: MS-Windows: missing build dependencyv8.1.1381
Problem: MS-Windows: missing build dependency.
Solution: Make gui_dwrite.cpp depend on gui_dwrite.h. (Ken Takata,
closes #4423
-rw-r--r-- | src/Make_cyg_ming.mak | 5 | ||||
-rw-r--r-- | src/Make_mvc.mak | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 811f1985f..7844e004c 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -1047,6 +1047,9 @@ INCL = vim.h alloc.h ascii.h ex_cmds.h feature.h globals.h \ keymap.h macros.h option.h os_dos.h os_win32.h proto.h regexp.h \ spell.h structs.h term.h beval.h $(NBDEBUG_INCL) GUI_INCL = gui.h +ifeq ($(DIRECTX),yes) +GUI_INCL += gui_dwrite.h +endif CUI_INCL = iscygpty.h $(OUTDIR)/if_python.o: if_python.c if_py_both.h $(INCL) @@ -1083,7 +1086,7 @@ endif $(OUTDIR): $(MKDIR) $(OUTDIR) -$(OUTDIR)/gui_dwrite.o: gui_dwrite.cpp $(INCL) gui_dwrite.h +$(OUTDIR)/gui_dwrite.o: gui_dwrite.cpp gui_dwrite.h $(CC) -c $(CFLAGS) $(CXXFLAGS) gui_dwrite.cpp -o $@ $(OUTDIR)/gui.o: gui.c $(INCL) $(GUI_INCL) diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 4981539b9..f8e406e43 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -1477,7 +1477,7 @@ $(OUTDIR)/gui_beval.obj: $(OUTDIR) gui_beval.c $(INCL) $(GUI_INCL) $(OUTDIR)/gui_w32.obj: $(OUTDIR) gui_w32.c $(INCL) $(GUI_INCL) -$(OUTDIR)/gui_dwrite.obj: $(OUTDIR) gui_dwrite.cpp $(INCL) $(GUI_INCL) +$(OUTDIR)/gui_dwrite.obj: $(OUTDIR) gui_dwrite.cpp gui_dwrite.h $(OUTDIR)/if_cscope.obj: $(OUTDIR) if_cscope.c $(INCL) if_cscope.h diff --git a/src/version.c b/src/version.c index f7fb44e6e..2401cc2a8 100644 --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1381, +/**/ 1380, /**/ 1379, |