# HG changeset patch # User Bram Moolenaar # Date 1267218322 -3600 # Node ID 0e4631bf94411717193870a5ad7d62945d06cadc # Parent 98cc757f7e3dbff20ade108b82582d7a7d88ed33 updated for version 7.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) diff --git a/src/Make_ming.mak b/src/Make_ming.mak --- a/src/Make_ming.mak +++ b/src/Make_ming.mak @@ -248,8 +248,8 @@ MKDIR = mkdir -p DIRSLASH = / else # normal (Windows) compilation: +CROSS_COMPILE = ifneq (sh.exe, $(SHELL)) -CROSS_COMPILE = 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 --- 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,