diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-02-26 22:05:22 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-02-26 22:05:22 +0100 |
| commit | 86ce1cc086449a39c48e1672b0f6053f07301429 (patch) | |
| tree | b25c424d1b423dec903b0459d35be8b4387d0266 | |
| parent | 72b73c12dc28e03a195f932c9f99bccfce92506a (diff) | |
| download | vim-git-7.2.377.tar.gz | |
updated for version 7.2.377v7.2.377
Problem: Misplaced assignment. Duplicate build line for gvimext.dll.
Solution: Move setting CROSS_COMPILE to before ifneq. Remove the wrong
build line. (Markus Heidelberg)
| -rw-r--r-- | src/Make_ming.mak | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/Make_ming.mak b/src/Make_ming.mak index ca630de80..f57fb18d0 100644 --- a/src/Make_ming.mak +++ b/src/Make_ming.mak @@ -248,8 +248,8 @@ MKDIR = mkdir -p DIRSLASH = / else # normal (Windows) compilation: -ifneq (sh.exe, $(SHELL)) CROSS_COMPILE = +ifneq (sh.exe, $(SHELL)) DEL = rm MKDIR = mkdir -p DIRSLASH = / @@ -553,7 +553,6 @@ xxd/xxd.exe: xxd/xxd.c $(MAKE) -C xxd -f Make_cyg.mak CC=$(CC) GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h - $(MAKE) -C GvimExt -f Make_ming.mak $(MAKE) -C GvimExt -f Make_ming.mak CROSS=$(CROSS) CROSS_COMPILE=$(CROSS_COMPILE) clean: diff --git a/src/version.c b/src/version.c index 1eff44f1e..90096ac18 100644 --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 377, +/**/ 376, /**/ 375, |