diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-03-07 20:58:50 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-03-07 20:58:50 +0100 |
commit | 47cff3a444be7e99bae52b39b2174c22d58d2f86 (patch) | |
tree | 3666ff76e1e597b1c8b220a117088b5210768b84 | |
parent | 4e329fcaf7122370a6d1815a30aaf29476d3f722 (diff) | |
download | vim-git-47cff3a444be7e99bae52b39b2174c22d58d2f86.tar.gz |
patch 7.4.1508v7.4.1508
Problem: Can't build GvimExt with MingW.
Solution: Adjust the makefile. (Ben Fritz)
-rw-r--r-- | src/GvimExt/Make_ming.mak | 6 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/GvimExt/Make_ming.mak b/src/GvimExt/Make_ming.mak index 2976ea05c..a6ab3ae10 100644 --- a/src/GvimExt/Make_ming.mak +++ b/src/GvimExt/Make_ming.mak @@ -43,6 +43,10 @@ else DEL = del endif endif +# Set the default $(WINVER) to make it work with WinXP. +ifndef WINVER +WINVER = 0x0501 +endif CXX := $(CROSS_COMPILE)g++ WINDRES := $(CROSS_COMPILE)windres WINDRES_CXX = $(CXX) @@ -68,7 +72,7 @@ $(DLL): $(OBJ) $(RES) $(DEFFILE) $(LIBS) gvimext.o: gvimext.cpp - $(CXX) $(CXXFLAGS) -DFEAT_GETTEXT -c $? -o $@ + $(CXX) $(CXXFLAGS) -DFEAT_GETTEXT -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) -c $? -o $@ $(RES): gvimext_ming.rc $(WINDRES) $(WINDRES_FLAGS) --input-format=rc --output-format=coff -DMING $? -o $@ diff --git a/src/version.c b/src/version.c index 40690ec80..c4012e265 100644 --- a/src/version.c +++ b/src/version.c @@ -744,6 +744,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1508, +/**/ 1507, /**/ 1506, |