From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 29 Sep 2010 10:38:00 +0000 (+0200)
Subject: updated for version 7.3.012
X-Git-Tag: v7.3.012
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c9ab1c0e0c812d407331fad37d59112dd40605a;p=vim

updated for version 7.3.012
Problem:    Problems building with MingW.
Solution:   Adjust the MingW makefiles. (Jon)
---

diff --git a/src/GvimExt/Make_ming.mak b/src/GvimExt/Make_ming.mak
index 5997e7ed9..f7265e9b2 100644
--- 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
diff --git a/src/Make_ming.mak b/src/Make_ming.mak
index 306dff925..971915cbc 100644
--- 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
 ###########################################################################
diff --git a/src/version.c b/src/version.c
index 884474cdc..0b5d7faca 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    12,
 /**/
     11,
 /**/