diff options
| author | Bram Moolenaar <bram@vim.org> | 2010-09-29 12:38:00 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2010-09-29 12:38:00 +0200 |
| commit | 3aac6b59709876797f2c83c10940ec50f7b70d24 (patch) | |
| tree | b44cb0ab1717603f461a61ee741e00ee5fec0bfe | |
| parent | c6247aebd5cc3a0b9a3e9d8ddc2f018cb81495cf (diff) | |
| download | vim-3aac6b59709876797f2c83c10940ec50f7b70d24.tar.gz | |
Problem: Problems building with MingW.
Solution: Adjust the MingW makefiles. (Jon)
| -rw-r--r-- | src/GvimExt/Make_ming.mak | 2 | ||||
| -rw-r--r-- | src/Make_ming.mak | 2 | ||||
| -rw-r--r-- | 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 5997e7ed..f7265e9b 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 306dff92..971915cb 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 884474cd..0b5d7fac 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, |