diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-09-30 16:56:02 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-09-30 16:56:02 +0200 |
| commit | 2369e35b39e4e5d1d586cf808770c4fb91faae72 (patch) | |
| tree | 3069da7fa2137aa330a1027e13f7f5fd7b0cf36e | |
| parent | acd6a049f68d0a69a96240c2d928a7ddda9c4c69 (diff) | |
| download | vim-git-2369e35b39e4e5d1d586cf808770c4fb91faae72.tar.gz | |
updated for version 7.3.326v7.3.326
Problem: MingW 4.6 no longer supports the -mno-cygwin option.
Solution: Split the Cygwin and MingW makefiles. (Matsushita Shougo)
| -rw-r--r-- | Filelist | 1 | ||||
| -rw-r--r-- | src/GvimExt/Make_ming.mak | 9 | ||||
| -rw-r--r-- | src/Make_cyg.mak | 4 | ||||
| -rw-r--r-- | src/Make_ming.mak | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 11 insertions, 9 deletions
@@ -313,6 +313,7 @@ SRC_DOS = \ src/xxd/Make_bc5.mak \ src/xxd/Make_cyg.mak \ src/xxd/Make_djg.mak \ + src/xxd/Make_ming.mak \ src/xxd/Make_mvc.mak \ nsis/gvim.nsi \ nsis/README.txt \ diff --git a/src/GvimExt/Make_ming.mak b/src/GvimExt/Make_ming.mak index d764e3f04..9c383b0b1 100644 --- a/src/GvimExt/Make_ming.mak +++ b/src/GvimExt/Make_ming.mak @@ -1,6 +1,6 @@ # Project: gvimext # Generates gvimext.dll with gcc. -# Can be used for Cygwin and MingW (MingW ignores -mno-cygwin) +# To be used with MingW. # # Originally, the DLL base address was fixed: -Wl,--image-base=0x1C000000 # Now it is allocated dymanically by the linker by evaluating all DLLs @@ -31,12 +31,12 @@ endif ifeq ($(CROSS),yes) DEL = rm ifeq ($(MINGWOLD),yes) -CXXFLAGS := -O2 -mno-cygwin -fvtable-thunks +CXXFLAGS := -O2 -fvtable-thunks else -CXXFLAGS := -O2 -mno-cygwin +CXXFLAGS := -O2 endif else -CXXFLAGS := -O2 -mno-cygwin +CXXFLAGS := -O2 ifneq (sh.exe, $(SHELL)) DEL = rm else @@ -75,4 +75,3 @@ $(RES): gvimext_ming.rc clean: clean-custom -$(DEL) $(OBJ) $(RES) $(DLL) - diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak index 9cc3784ea..332f946ad 100644 --- a/src/Make_cyg.mak +++ b/src/Make_cyg.mak @@ -536,7 +536,7 @@ xxd/xxd.exe: xxd/xxd.c $(MAKE) -C xxd -f Make_cyg.mak CC=$(CC) USEDLL=$(USEDLL) GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h - $(MAKE) -C GvimExt -f Make_ming.mak CROSS_COMPILE=$(CROSS_COMPILE) + $(MAKE) -C GvimExt -f Make_cyg.mak CROSS_COMPILE=$(CROSS_COMPILE) vimrun.exe: vimrun.c $(CC) $(CFLAGS) -o vimrun.exe vimrun.c $(LIBS) @@ -565,7 +565,7 @@ ifdef MZSCHEME endif -$(DEL) pathdef.c $(MAKE) -C xxd -f Make_cyg.mak clean - $(MAKE) -C GvimExt -f Make_ming.mak clean + $(MAKE) -C GvimExt -f Make_cyg.mak clean distclean: clean -$(DEL) obj$(DIRSLASH)*.o diff --git a/src/Make_ming.mak b/src/Make_ming.mak index 88f37f67e..5867696ae 100644 --- a/src/Make_ming.mak +++ b/src/Make_ming.mak @@ -641,7 +641,7 @@ upx: exes upx vim.exe xxd/xxd.exe: xxd/xxd.c - $(MAKE) -C xxd -f Make_cyg.mak CC=$(CC) + $(MAKE) -C xxd -f Make_ming.mak CC=$(CC) GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h $(MAKE) -C GvimExt -f Make_ming.mak CROSS=$(CROSS) CROSS_COMPILE=$(CROSS_COMPILE) @@ -659,7 +659,7 @@ ifdef MZSCHEME -$(DEL) mzscheme_base.c endif $(MAKE) -C GvimExt -f Make_ming.mak clean - $(MAKE) -C xxd -f Make_cyg.mak clean + $(MAKE) -C xxd -f Make_ming.mak clean ########################################################################### INCL = vim.h feature.h os_win32.h os_dos.h ascii.h keymap.h term.h macros.h \ diff --git a/src/version.c b/src/version.c index 96f2ee49a..02f6b9cd4 100644 --- a/src/version.c +++ b/src/version.c @@ -710,6 +710,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 326, +/**/ 325, /**/ 324, |