# HG changeset patch # User Bram Moolenaar # Date 1285756680 -7200 # Node ID 5df74a812b7b20bd7e33634453c645be0eb8a2c4 # Parent d0049ff5969e3aa82999e9c5550f09da7b294ff5 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 --- 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 --- 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 --- 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 */ /**/ + 12, +/**/ 11, /**/ 10,