# HG changeset patch # User Bram Moolenaar # Date 1285778548 -7200 # Node ID 56b638f2029e728f1fb20382a7184a8e4ebdce9f # Parent 103dea6545430092db1851d1b712a742af1a74f2 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 --- 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 --- 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 --- 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 */ /**/ + 18, +/**/ 17, /**/ 16,