Mercurial > vim

changeset 3441:08a37c57af47 v7.3.486

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <bram@vim.org>
date Wed, 28 Mar 2012 17:43:11 +0200
parents 8dc485c4ee3e
children 1bf039d645cf
files src/Make_ming.mak src/version.c
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/Make_ming.mak
+++ b/src/Make_ming.mak
@@ -681,11 +681,9 @@ INCL = vim.h feature.h os_win32.h os_dos
 $(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)
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    486,
+/**/
     485,
 /**/
     484,