diff options
author | Bram Moolenaar <Bram@vim.org> | 2012-03-28 17:43:11 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2012-03-28 17:43:11 +0200 |
commit | ca628610c06abed1b39470d20e7d73f8f7a860af (patch) | |
tree | ef1bd48051eb7c9ea54a43858303399ffb646b08 /src/Make_ming.mak | |
parent | da5a4970a9e143ca5c936d28ad1709edba07d3b0 (diff) | |
download | vim-git-ca628610c06abed1b39470d20e7d73f8f7a860af.tar.gz |
updated for version 7.3.486v7.3.486
Problem: Build error with mingw64 on Windows 7.
Solution: Avoid the step of going through vimres.res. (Guopeng Wen)
Diffstat (limited to 'src/Make_ming.mak')
-rw-r--r-- | src/Make_ming.mak | 8 |
1 files changed, 3 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) |