patch 8.1.1381: MS-Windows: missing build dependency

Problem:    MS-Windows: missing build dependency.
Solution:   Make gui_dwrite.cpp depend on gui_dwrite.h. (Ken Takata,
            closes #4423

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 811f1985f38c7798afb1117f9a6455d281978ca7..7844e004c6f56de5420f88ad06a8f34f7df7bd62 100644 (file)
--- 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 4981539b913b66fcdf12908744fb300ee03df0da..f8e406e436ce1ca9018e8d7e30be102bd08e581e 100644 (file)
--- 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 f7fb44e6e85f688a90cce17349901a207cf049d0..2401cc2a8c0f95c9b1a9fdf116620c770d90012b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1381,
 /**/
     1380,
 /**/