vim/patches/vim-7.3.486.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.486
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.3.486
  11 Problem:    Build error with mingw64 on Windows 7.
  12 Solution:   Avoid the step of going through vimres.res. (Guopeng Wen)
  13 Files:      src/Make_ming.mak
  14
  15
  16 *** ../vim-7.3.485/src/Make_ming.mak    2012-02-29 16:56:35.000000000 +0100
  17 --- src/Make_ming.mak   2012-03-28 17:41:55.000000000 +0200
  18 ***************
  19 *** 681,691 ****
  20   $(OUTDIR)/%.o : %.c $(INCL)
  21         $(CC) -c $(CFLAGS) $< -o $@
  22
  23 ! $(OUTDIR)/vimres.res: vim.rc version.h gui_w32_rc.h
  24 !       $(WINDRES) $(WINDRES_FLAGS) $(DEFINES) vim.rc $(OUTDIR)/vimres.res
  25 !
  26 ! $(OUTDIR)/vimrc.o: $(OUTDIR)/vimres.res
  27 !       $(WINDRES) $(WINDRES_FLAGS) $(OUTDIR)/vimres.res $(OUTDIR)/vimrc.o
  28
  29   $(OUTDIR):
  30         $(MKDIR) $(OUTDIR)
  31 --- 681,689 ----
  32   $(OUTDIR)/%.o : %.c $(INCL)
  33         $(CC) -c $(CFLAGS) $< -o $@
  34
  35 ! $(OUTDIR)/vimrc.o: vim.rc version.h gui_w32_rc.h
  36 !       $(WINDRES) $(WINDRES_FLAGS) $(DEFINES) \
  37 !           --input-format=rc --output-format=coff -i vim.rc -o $@
  38
  39   $(OUTDIR):
  40         $(MKDIR) $(OUTDIR)
  41 *** ../vim-7.3.485/src/version.c        2012-03-28 17:17:45.000000000 +0200
  42 --- src/version.c       2012-03-28 17:42:25.000000000 +0200
  43 ***************
  44 *** 716,717 ****
  45 --- 716,719 ----
  46   {   /* Add new patch number below this line */
  47 + /**/
  48 +     486,
  49   /**/
  50
  51 --
  52 There is a fine line between courage and foolishness.
  53 Unfortunately, it's not a fence.
  54
  55  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  56 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  57 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  58  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///