diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-01-15 22:34:45 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-01-15 22:34:45 +0100 |
commit | abfa9efb983c6fe9f5c4c342ff4d7017ce9a2c4b (patch) | |
tree | 97fac993c46108bc4e29da8588592d119c30d96b /src/GvimExt | |
parent | 36d7cd8965bc4027d420c7d70c56ac95d83d3bfa (diff) | |
download | vim-git-abfa9efb983c6fe9f5c4c342ff4d7017ce9a2c4b.tar.gz |
patch 7.4.1100v7.4.1100
Problem: Cygwin makefiles are unused.
Solution: Remove them.
Diffstat (limited to 'src/GvimExt')
-rw-r--r-- | src/GvimExt/Make_cyg.mak | 77 | ||||
-rw-r--r-- | src/GvimExt/Make_ming.mak | 2 |
2 files changed, 1 insertions, 78 deletions
diff --git a/src/GvimExt/Make_cyg.mak b/src/GvimExt/Make_cyg.mak deleted file mode 100644 index a638688b7..000000000 --- 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) diff --git a/src/GvimExt/Make_ming.mak b/src/GvimExt/Make_ming.mak index d1d060bfa..2976ea05c 100644 --- 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 |