Permalink
Browse files

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)
  • Loading branch information...
1 parent 4b59ee9 commit e19e870c55b5ba3561e57a4abd6feb5e8b6b3614 @brammool brammool committed Mar 28, 2012
Showing with 5 additions and 5 deletions.
  1. +3 −5 src/Make_ming.mak
  2. +2 −0 src/version.c
View
@@ -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)
View
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 486,
+/**/
485,
/**/
484,

0 comments on commit e19e870

Please sign in to comment.