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 5997e7ed912d53d42153ebb323453fd9743a2da3..f7265e9b281420d7dd2d46493d3fb5423aba6438 100644 (file)
--- 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 306dff92539ac820096c54bc2b1e56ebac1a0380..971915cbc113f5ff0048db4d911c4a7542f9d29b 100644 (file)
--- 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 884474cdc1568e6f23aa75fb1e9c5b5ef67dc2b3..0b5d7faca3485d87959666b0c75b816385164a14 100644 (file)
--- 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,
 /**/