diff options
author | Bram Moolenaar <Bram@vim.org> | 2011-10-03 22:12:32 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2011-10-03 22:12:32 +0200 |
commit | 946c1eeafc01caa8525131f0939b901057221c82 (patch) | |
tree | 97edb9d1ac85ff4fa4844548dbf57d2c8ddf5d06 | |
parent | 250912918e303cef57cfaa6e1c54aaaac32a9189 (diff) | |
download | vim-git-946c1eeafc01caa8525131f0939b901057221c82.tar.gz |
Add files aaded by patch 7.3.326.
-rw-r--r-- | src/GvimExt/Make_cyg.mak | 77 | ||||
-rw-r--r-- | src/xxd/Make_ming.mak | 28 |
2 files changed, 105 insertions, 0 deletions
diff --git a/src/GvimExt/Make_cyg.mak b/src/GvimExt/Make_cyg.mak new file mode 100644 index 000000000..80a2a65d9 --- /dev/null +++ b/src/GvimExt/Make_cyg.mak @@ -0,0 +1,77 @@ +# 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 -mno-cygwin -fvtable-thunks +else +CXXFLAGS := -O2 -mno-cygwin +endif +else +CXXFLAGS := -O2 -mno-cygwin +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/xxd/Make_ming.mak b/src/xxd/Make_ming.mak new file mode 100644 index 000000000..5147e89c1 --- /dev/null +++ b/src/xxd/Make_ming.mak @@ -0,0 +1,28 @@ +# The most simplistic Makefile, for MinGW 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 |