aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-25 10:54:51 -04:00
Code

updated for version 7.3.326

Browse Source 
Problem:    MingW 4.6 no longer supports the -mno-cygwin option.
Solution:   Split the Cygwin and MingW makefiles. (Matsushita Shougo)
This commit is contained in:
Bram Moolenaar 2011-09-30 16:56:02 +02:00
parent acd6a049f6
commit 2369e35b39
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Filelist
View File

@ -313,6 +313,7 @@ SRC_DOS = \
src/xxd/Make_bc5.mak \ src/xxd/Make_bc5.mak \
src/xxd/Make_cyg.mak \ src/xxd/Make_cyg.mak \
src/xxd/Make_djg.mak \ src/xxd/Make_djg.mak \
src/xxd/Make_ming.mak \
src/xxd/Make_mvc.mak \ src/xxd/Make_mvc.mak \
nsis/gvim.nsi \ nsis/gvim.nsi \
nsis/README.txt \ nsis/README.txt \

9
src/GvimExt/Make_ming.mak
View File

@ -1,6 +1,6 @@
# Project: gvimext # Project: gvimext
# Generates gvimext.dll with gcc. # 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 # Originally, the DLL base address was fixed: -Wl,--image-base=0x1C000000
# Now it is allocated dymanically by the linker by evaluating all DLLs # Now it is allocated dymanically by the linker by evaluating all DLLs
@ -31,12 +31,12 @@ endif
ifeq ($(CROSS),yes) ifeq ($(CROSS),yes)
DEL = rm DEL = rm
ifeq ($(MINGWOLD),yes) ifeq ($(MINGWOLD),yes)
CXXFLAGS := -O2 -mno-cygwin -fvtable-thunks CXXFLAGS := -O2 -fvtable-thunks
else else
CXXFLAGS := -O2 -mno-cygwin CXXFLAGS := -O2
endif endif
else else
CXXFLAGS := -O2 -mno-cygwin CXXFLAGS := -O2
ifneq (sh.exe, $(SHELL)) ifneq (sh.exe, $(SHELL))
DEL = rm DEL = rm
else else
@ -75,4 +75,3 @@ $(RES): gvimext_ming.rc
clean: clean-custom clean: clean-custom
-$(DEL) $(OBJ) $(RES) $(DLL) -$(DEL) $(OBJ) $(RES) $(DLL)

4
src/Make_cyg.mak
View File

@ -536,7 +536,7 @@ xxd/xxd.exe: xxd/xxd.c
$(MAKE) -C xxd -f Make_cyg.mak CC=$(CC) USEDLL=$(USEDLL) $(MAKE) -C xxd -f Make_cyg.mak CC=$(CC) USEDLL=$(USEDLL)
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 CROSS_COMPILE=$(CROSS_COMPILE) $(MAKE) -C GvimExt -f Make_cyg.mak CROSS_COMPILE=$(CROSS_COMPILE)
vimrun.exe: vimrun.c vimrun.exe: vimrun.c
$(CC) $(CFLAGS) -o vimrun.exe vimrun.c $(LIBS) $(CC) $(CFLAGS) -o vimrun.exe vimrun.c $(LIBS)
@ -565,7 +565,7 @@ ifdef MZSCHEME
endif endif
-$(DEL) pathdef.c -$(DEL) pathdef.c
$(MAKE) -C xxd -f Make_cyg.mak clean $(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 distclean: clean
-$(DEL) obj$(DIRSLASH)*.o -$(DEL) obj$(DIRSLASH)*.o

4
src/Make_ming.mak
View File

@ -641,7 +641,7 @@ upx: exes
upx vim.exe upx vim.exe
xxd/xxd.exe: xxd/xxd.c 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 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) $(MAKE) -C GvimExt -f Make_ming.mak CROSS=$(CROSS) CROSS_COMPILE=$(CROSS_COMPILE)
@ -659,7 +659,7 @@ ifdef MZSCHEME
-$(DEL) mzscheme_base.c -$(DEL) mzscheme_base.c
endif endif
$(MAKE) -C GvimExt -f Make_ming.mak clean $(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 \ INCL = vim.h feature.h os_win32.h os_dos.h ascii.h keymap.h term.h macros.h \

2
src/version.c
View File

@ -709,6 +709,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 */
/**/
326,
/**/ /**/
325, 325,
/**/ /**/