From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 28 Mar 2012 15:43:11 +0000 (+0200)
Subject: updated for version 7.3.486
X-Git-Tag: v7.3.486
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca628610c06abed1b39470d20e7d73f8f7a860af;p=thirdparty%2Fvim.git

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 64c3db8349..ca50d371dd 100644
--- 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 2009133189..efa29f6197 100644
--- 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,
 /**/