Mercurial > vim

changeset 2093:0e4631bf9441 v7.2.377

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <bram@zimbu.org>
date Fri, 26 Feb 2010 22:05:22 +0100
parents 98cc757f7e3d
children e319a4fe6e32
files src/Make_ming.mak src/version.c
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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:
--- 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,