updated for version 7.3.018

Problem:    Missing argument to windres in MingW makefiles.
Solution:   Add the argument that was wrapped in the patch. (Jon Maken)

diff --git a/src/GvimExt/Make_ming.mak b/src/GvimExt/Make_ming.mak
index f7265e9b281420d7dd2d46493d3fb5423aba6438..3d9474347464621333a7c2de456f760da0525ec4 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 --preprocessor="$(CXX) -E -xc" -
+WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CXX) -E -xc" -DRC_INVOKED
 LIBS :=  -luuid
 RES  := gvimext.res
 DEFFILE = gvimext_ming.def

diff --git a/src/Make_ming.mak b/src/Make_ming.mak
index 971915cbc113f5ff0048db4d911c4a7542f9d29b..a6fd17082169abe634e735636d46eb82e952b8f7 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 --preprocessor="$(CC) -E -xc" -
+WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CC) -E -xc" -DRC_INVOKED
 
 #>>>>> end of choices
 ###########################################################################

diff --git a/src/version.c b/src/version.c
index d04419c3c47304c51d81f9432fa14f32f313de6b..2154b3c1325570784c5ec69107c0dafc8f6ef982 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 */
+/**/
+    18,
 /**/
     17,
 /**/