Permalink
Browse files

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)
  • Loading branch information...
1 parent c140e21 commit 014cde7bfa0921c92cf5eab1847379dff66167fc @brammool brammool committed Sep 30, 2011
Showing with 11 additions and 9 deletions.
  1. +1 −0 Filelist
  2. +4 −5 src/GvimExt/Make_ming.mak
  3. +2 −2 src/Make_cyg.mak
  4. +2 −2 src/Make_ming.mak
  5. +2 −0 src/version.c
View
@@ -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 \
@@ -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)
-
View
@@ -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
View
@@ -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 \
View
@@ -710,6 +710,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 326,
+/**/
325,
/**/
324,

0 comments on commit 014cde7

Please sign in to comment.