diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-12-30 14:50:52 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-12-30 14:50:52 +0100 |
| commit | b0d3f878a4b78110fb7b0f962c9ae61d0fc6a017 (patch) | |
| tree | cf352b2eb0b0b5f6564231b43ac479f93eb6036b /src/GvimExt/Make_ming.mak | |
| parent | 9980835c68a718ac8616b85f595c5f957667e9a2 (diff) | |
| download | vim-git-b0d3f878a4b78110fb7b0f962c9ae61d0fc6a017.tar.gz | |
updated for version 7.3.093v7.3.093
Problem: New DLL dependencies in MingW with gcc 4.5.0.
Solution: Add STATIC_STDCPLUS, LDFLAGS and split up WINDRES. (Guopeng Wen)
Diffstat (limited to 'src/GvimExt/Make_ming.mak')
| -rw-r--r-- | src/GvimExt/Make_ming.mak | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/GvimExt/Make_ming.mak b/src/GvimExt/Make_ming.mak index 3d9474347..d764e3f04 100644 --- a/src/GvimExt/Make_ming.mak +++ b/src/GvimExt/Make_ming.mak @@ -17,6 +17,17 @@ CROSS = no # 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) @@ -33,7 +44,9 @@ DEL = del endif endif CXX := $(CROSS_COMPILE)g++ -WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CXX) -E -xc" -DRC_INVOKED +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 @@ -46,7 +59,7 @@ DLL := gvimext.dll all: all-before $(DLL) all-after $(DLL): $(OBJ) $(RES) $(DEFFILE) - $(CXX) -shared $(CXXFLAGS) -s -o $@ \ + $(CXX) $(LDFLAGS) $(CXXFLAGS) -s -o $@ \ -Wl,--enable-auto-image-base \ -Wl,--enable-auto-import \ -Wl,--whole-archive \ @@ -58,7 +71,7 @@ gvimext.o: gvimext.cpp $(CXX) $(CXXFLAGS) -DFEAT_GETTEXT -c $? -o $@ $(RES): gvimext_ming.rc - $(WINDRES) --input-format=rc --output-format=coff -DMING $? -o $@ + $(WINDRES) $(WINDRES_FLAGS) --input-format=rc --output-format=coff -DMING $? -o $@ clean: clean-custom -$(DEL) $(OBJ) $(RES) $(DLL) |