updated for version 7.3.326

Problem:    MingW 4.6 no longer supports the -mno-cygwin option.
Solution:   Split the Cygwin and MingW makefiles. (Matsushita Shougo)

diff --git a/Filelist b/Filelist
index 221137d71de909c6cccb119a9e696c451ba51273..80b58fc7b382de1d2f6202adbcc5c0f2ccf19f98 100644 (file)
--- a/Filelist
+++ b/Filelist
@@ -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 d764e3f0498b6e543cb4e77eb919d1fec598e2f4..9c383b0b1f8154ebef35f34af8306efcca68666d 100644 (file)
--- 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 9cc3784ea25627606e0a0832bb673ff1ce74ee84..332f946ad2d184b14738e4bba0f8dc151e651569 100644 (file)
--- 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 88f37f67ede72b1601362df31169afc28410ceb0..5867696ae9dcd6b800a33b1473c4f8699936196a 100644 (file)
--- 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 96f2ee49aa656c4bc7bb4f773e79d46c51ef7cff..02f6b9cd47a2d61d085cdcb2a04a6eda306f841c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    326,
 /**/
     325,
 /**/