diff options
| -rw-r--r-- | src/Make_ming.mak | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Make_ming.mak b/src/Make_ming.mak index 64c3db834..ca50d371d 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 200913318..efa29f619 100644 --- 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, |