updated for version 7.3.486

Problem:    Build error with mingw64 on Windows 7.
Solution:   Avoid the step of going through vimres.res. (Guopeng Wen)

diff --git a/src/Make_ming.mak b/src/Make_ming.mak
index 64c3db83491606f2851f94695d75cbeee159158c..ca50d371dd1b88ac9b99e1cdb1f04d2a8c0a4436 100644 (file)
--- a/src/Make_ming.mak
+++ b/src/Make_ming.mak
@@ -681,11 +681,9 @@ $(OUTDIR)/if_python3.o : if_python3.c $(INCL)
 $(OUTDIR)/%.o : %.c $(INCL)
        $(CC) -c $(CFLAGS) $< -o $@
 
-$(OUTDIR)/vimres.res: vim.rc version.h gui_w32_rc.h
-       $(WINDRES) $(WINDRES_FLAGS) $(DEFINES) vim.rc $(OUTDIR)/vimres.res
-
-$(OUTDIR)/vimrc.o: $(OUTDIR)/vimres.res
-       $(WINDRES) $(WINDRES_FLAGS) $(OUTDIR)/vimres.res $(OUTDIR)/vimrc.o
+$(OUTDIR)/vimrc.o: vim.rc version.h gui_w32_rc.h
+       $(WINDRES) $(WINDRES_FLAGS) $(DEFINES) \
+           --input-format=rc --output-format=coff -i vim.rc -o $@
 
 $(OUTDIR):
        $(MKDIR) $(OUTDIR)

diff --git a/src/version.c b/src/version.c
index 200913318970a07e464ba24c471d78fb911d8ee0..efa29f61975cae5f64f4603243f37715be4900f3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    486,
 /**/
     485,
 /**/