Mercurial > vim
changeset 7602:a82b2d79e61b
commit https://github.com/vim/vim/commit/abfa9efb983c6fe9f5c4c342ff4d7017ce9a2c4b
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jan 15 22:34:45 2016 +0100
patch 7.4.1100
Problem: Cygwin makefiles are unused.
Solution: Remove them.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 15 Jan 2016 22:45:04 +0100 |
| parents | 88c4c634e919 |
| children | d3892f6c917e |
| files | src/GvimExt/Make_cyg.mak src/GvimExt/Make_ming.mak src/version.c src/xxd/Make_cyg.mak src/xxd/Make_ming.mak |
| diffstat | 5 files changed, 4 insertions(+), 107 deletions(-) [+] |
line wrap: on
line diff
deleted file mode 100644 --- a/src/GvimExt/Make_cyg.mak +++ /dev/null @@ -1,77 +0,0 @@ -# Project: gvimext -# Generates gvimext.dll with gcc. -# To be used with Cygwin. -# -# Originally, the DLL base address was fixed: -Wl,--image-base=0x1C000000 -# Now it is allocated dymanically by the linker by evaluating all DLLs -# already loaded in memory. The binary image contains as well information -# for automatic pseudo-rebasing, if needed by the system. ALV 2004-02-29 - -# If cross-compiling set this to yes, else set it to no -CROSS = no -#CROSS = yes -# For the old MinGW 2.95 (the one you get e.g. with debian woody) -# set the following variable to yes and check if the executables are -# really named that way. -# If you have a newer MinGW or you are using cygwin set it to no and -# check also the executables -MINGWOLD = no - -# Link against the shared versions of libgcc/libstdc++ by default. Set -# STATIC_STDCPLUS to "yes" to link against static versions instead. -STATIC_STDCPLUS=no -#STATIC_STDCPLUS=yes - -# Note: -static-libstdc++ is not available until gcc 4.5.x. -LDFLAGS += -shared -ifeq (yes, $(STATIC_STDCPLUS)) -LDFLAGS += -static-libgcc -static-libstdc++ -endif - -ifeq ($(CROSS),yes) -DEL = rm -ifeq ($(MINGWOLD),yes) -CXXFLAGS := -O2 -fvtable-thunks -else -CXXFLAGS := -O2 -endif -else -CXXFLAGS := -O2 -ifneq (sh.exe, $(SHELL)) -DEL = rm -else -DEL = del -endif -endif -CXX := $(CROSS_COMPILE)g++ -WINDRES := $(CROSS_COMPILE)windres -WINDRES_CXX = $(CXX) -WINDRES_FLAGS = --preprocessor="$(WINDRES_CXX) -E -xc" -DRC_INVOKED -LIBS := -luuid -RES := gvimext.res -DEFFILE = gvimext_ming.def -OBJ := gvimext.o - -DLL := gvimext.dll - -.PHONY: all all-before all-after clean clean-custom - -all: all-before $(DLL) all-after - -$(DLL): $(OBJ) $(RES) $(DEFFILE) - $(CXX) $(LDFLAGS) $(CXXFLAGS) -s -o $@ \ - -Wl,--enable-auto-image-base \ - -Wl,--enable-auto-import \ - -Wl,--whole-archive \ - $^ \ - -Wl,--no-whole-archive \ - $(LIBS) - -gvimext.o: gvimext.cpp - $(CXX) $(CXXFLAGS) -DFEAT_GETTEXT -c $? -o $@ - -$(RES): gvimext_ming.rc - $(WINDRES) $(WINDRES_FLAGS) --input-format=rc --output-format=coff -DMING $? -o $@ - -clean: clean-custom - -$(DEL) $(OBJ) $(RES) $(DLL)
--- a/src/GvimExt/Make_ming.mak +++ b/src/GvimExt/Make_ming.mak @@ -1,6 +1,6 @@ # Project: gvimext # Generates gvimext.dll with gcc. -# To be used with MingW. +# To be used with MingW and Cygwin. # # Originally, the DLL base address was fixed: -Wl,--image-base=0x1C000000 # Now it is allocated dymanically by the linker by evaluating all DLLs
--- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1100, +/**/ 1099, /**/ 1098,
deleted file mode 100644 --- a/src/xxd/Make_cyg.mak +++ /dev/null @@ -1,28 +0,0 @@ -# The most simplistic Makefile, for Cygnus gcc on MS-DOS - -ifndef USEDLL -USEDLL = no -endif - -ifeq (yes, $(USEDLL)) -DEFINES = -LIBS = -lc -else -DEFINES = -LIBS = -endif - -CC = gcc -CFLAGS = -O2 -Wall -DWIN32 $(DEFINES) - -ifneq (sh.exe, $(SHELL)) -DEL = rm -else -DEL = del -endif - -xxd.exe: xxd.c - $(CC) $(CFLAGS) -s -o xxd.exe xxd.c $(LIBS) - -clean: - -$(DEL) xxd.exe