Mercurial > vim

changeset 2588:5df74a812b7b v7.3.012

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.012 Problem: Problems building with MingW. Solution: Adjust the MingW makefiles. (Jon)
author Bram Moolenaar <bram@vim.org>
date Wed, 29 Sep 2010 12:38:00 +0200
parents d0049ff5969e
children d5681bd2661b
files src/GvimExt/Make_ming.mak src/Make_ming.mak src/version.c
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/GvimExt/Make_ming.mak
+++ b/src/GvimExt/Make_ming.mak
@@ -33,7 +33,7 @@ DEL = del
 endif
 endif
 CXX := $(CROSS_COMPILE)g++
-WINDRES := $(CROSS_COMPILE)windres
+WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CXX) -E -xc" -
 LIBS :=  -luuid
 RES  := gvimext.res
 DEFFILE = gvimext_ming.def
--- a/src/Make_ming.mak
+++ b/src/Make_ming.mak
@@ -303,7 +303,7 @@ DIRSLASH = \\
 endif
 endif
 CC := $(CROSS_COMPILE)gcc
-WINDRES := $(CROSS_COMPILE)windres
+WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CC) -E -xc" -
 
 #>>>>> end of choices
 ###########################################################################
--- 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 */
 /**/
+    12,
+/**/
     11,
 /**/
     10,