summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-09-29 12:38:00 +0200
committerBram Moolenaar <Bram@vim.org>2010-09-29 12:38:00 +0200
commit3c9ab1c0e0c812d407331fad37d59112dd40605a (patch)
tree02b26b68b923204d5708398c0f33fdba45cb614c
parent006590697c134891ddb6b618355510fcb50f85f3 (diff)
downloadvim-git-3c9ab1c0e0c812d407331fad37d59112dd40605a.tar.gz
updated for version 7.3.012v7.3.012
Problem: Problems building with MingW. Solution: Adjust the MingW makefiles. (Jon)
-rw-r--r--src/GvimExt/Make_ming.mak2
-rw-r--r--src/Make_ming.mak2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/GvimExt/Make_ming.mak b/src/GvimExt/Make_ming.mak
index 5997e7ed9..f7265e9b2 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 306dff925..971915cbc 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 884474cdc..0b5d7faca 100644
--- 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,