lkundrak / rpms / vim

Forked from rpms/vim 4 years ago
Clone
bd48be1
To: vim-dev@vim.org
bd48be1
Subject: Patch 7.3.018
bd48be1
Fcc: outbox
bd48be1
From: Bram Moolenaar <Bram@moolenaar.net>
bd48be1
Mime-Version: 1.0
bd48be1
Content-Type: text/plain; charset=UTF-8
bd48be1
Content-Transfer-Encoding: 8bit
bd48be1
------------
bd48be1
bd48be1
Patch 7.3.018 (after 7.3.012)
bd48be1
Problem:    Missing argument to windres in MingW makefiles.
bd48be1
Solution:   Add the argument that was wrapped in the patch. (Jon Maken)
bd48be1
Files:	    src/Make_ming.mak, src/GvimExt/Make_ming.mak
bd48be1
bd48be1
bd48be1
*** ../vim-7.3.017/src/Make_ming.mak	2010-09-29 12:37:53.000000000 +0200
bd48be1
--- src/Make_ming.mak	2010-09-29 18:37:08.000000000 +0200
bd48be1
***************
bd48be1
*** 303,309 ****
bd48be1
  endif
bd48be1
  endif
bd48be1
  CC := $(CROSS_COMPILE)gcc
bd48be1
! WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CC) -E -xc" -
bd48be1
  
bd48be1
  #>>>>> end of choices
bd48be1
  ###########################################################################
bd48be1
--- 303,309 ----
bd48be1
  endif
bd48be1
  endif
bd48be1
  CC := $(CROSS_COMPILE)gcc
bd48be1
! WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CC) -E -xc" -DRC_INVOKED
bd48be1
  
bd48be1
  #>>>>> end of choices
bd48be1
  ###########################################################################
bd48be1
*** ../vim-7.3.017/src/GvimExt/Make_ming.mak	2010-09-29 12:37:53.000000000 +0200
bd48be1
--- src/GvimExt/Make_ming.mak	2010-09-29 18:36:39.000000000 +0200
bd48be1
***************
bd48be1
*** 33,39 ****
bd48be1
  endif
bd48be1
  endif
bd48be1
  CXX := $(CROSS_COMPILE)g++
bd48be1
! WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CXX) -E -xc" -
bd48be1
  LIBS :=  -luuid
bd48be1
  RES  := gvimext.res
bd48be1
  DEFFILE = gvimext_ming.def
bd48be1
--- 33,39 ----
bd48be1
  endif
bd48be1
  endif
bd48be1
  CXX := $(CROSS_COMPILE)g++
bd48be1
! WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CXX) -E -xc" -DRC_INVOKED
bd48be1
  LIBS :=  -luuid
bd48be1
  RES  := gvimext.res
bd48be1
  DEFFILE = gvimext_ming.def
bd48be1
*** ../vim-7.3.017/src/version.c	2010-09-29 18:32:47.000000000 +0200
bd48be1
--- src/version.c	2010-09-29 18:41:53.000000000 +0200
bd48be1
***************
bd48be1
*** 716,717 ****
bd48be1
--- 716,719 ----
bd48be1
  {   /* Add new patch number below this line */
bd48be1
+ /**/
bd48be1
+     18,
bd48be1
  /**/
bd48be1
bd48be1
-- 
bd48be1
hundred-and-one symptoms of being an internet addict:
bd48be1
231. You sprinkle Carpet Fresh on the rugs and put your vacuum cleaner
bd48be1
     in the front doorway permanently so it always looks like you are
bd48be1
     actually attempting to do something about that mess that has amassed
bd48be1
     since you discovered the Internet.
bd48be1
bd48be1
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
bd48be1
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
bd48be1
\\\        download, build and distribute -- http://www.A-A-P.org        ///
bd48be1
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///