diff options
| author | Bram Moolenaar <bram@vim.org> | 2010-09-29 18:42:28 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2010-09-29 18:42:28 +0200 |
| commit | 725fd86f9d774560609fca231201d9f9ff4a016f (patch) | |
| tree | a11c3ce6587ac2947b45843c7b378ece8318ac1b | |
| parent | 5f8679b53cf2100bcba5ff6265893ea035fc4d25 (diff) | |
| download | vim-725fd86f9d774560609fca231201d9f9ff4a016f.tar.gz | |
Problem: Missing argument to windres in MingW makefiles.
Solution: Add the argument that was wrapped in the patch. (Jon Maken)
| -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 f7265e9b..3d947434 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 --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 index 971915cb..a6fd1708 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 --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 index d04419c3..2154b3c1 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 */ /**/ + 18, +/**/ 17, /**/ 16, |