thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.2.377

Browse Source 
Problem:    Misplaced assignment.  Duplicate build line for gvimext.dll.
Solution:   Move setting CROSS_COMPILE to before ifneq.  Remove the wrong
            build line. (Markus Heidelberg)
This commit is contained in:
Bram Moolenaar
2010-02-26 22:05:22 +01:00
parent 72b73c12dc
commit 86ce1cc086
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Make_ming.mak
View File

@@ -248,8 +248,8 @@ MKDIR = mkdir -p
DIRSLASH = / DIRSLASH = /
else else
# normal (Windows) compilation: # normal (Windows) compilation:
ifneq (sh.exe, $(SHELL))
CROSS_COMPILE = CROSS_COMPILE =
ifneq (sh.exe, $(SHELL))
DEL = rm DEL = rm
MKDIR = mkdir -p MKDIR = mkdir -p
DIRSLASH = / DIRSLASH = /
@@ -553,7 +553,6 @@ xxd/xxd.exe: xxd/xxd.c
$(MAKE) -C xxd -f Make_cyg.mak CC=$(CC) $(MAKE) -C xxd -f Make_cyg.mak CC=$(CC)
GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h 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) $(MAKE) -C GvimExt -f Make_ming.mak CROSS=$(CROSS) CROSS_COMPILE=$(CROSS_COMPILE)
clean: clean:

2
src/version.c
View File

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