From 3c9ab1c0e0c812d407331fad37d59112dd40605a Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 29 Sep 2010 12:38:00 +0200 Subject: [PATCH] updated for version 7.3.012 Problem: Problems building with MingW. Solution: Adjust the MingW makefiles. (Jon) --- src/GvimExt/Make_ming.mak | 2 +- src/Make_ming.mak | 2 +- src/version.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/GvimExt/Make_ming.mak b/src/GvimExt/Make_ming.mak index 5997e7ed91..f7265e9b28 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 306dff9253..971915cbc1 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 884474cdc1..0b5d7faca3 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, /**/