From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 26 Feb 2010 21:05:22 +0000 (+0100)
Subject: updated for version 7.2.377
X-Git-Tag: v7.2.377
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86ce1cc086449a39c48e1672b0f6053f07301429;p=vim

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
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
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    377,
 /**/
     376,
 /**/