# HG changeset patch # User Bram Moolenaar # Date 1611599404 -3600 # Node ID 0660cb0a1cd805f07a1c963ed3944231602bfc12 # Parent c47336ebd7cd27fbce19c65bd6ccdd8ab2fce135 patch 8.2.2408: MinGW: "--preprocessor" flag no longer supported Commit: https://github.com/vim/vim/commit/5c829bf229de463657e4ba1de6c4ee91899de14e Author: Bram Moolenaar Date: Mon Jan 25 19:18:02 2021 +0100 patch 8.2.2408: MinGW: "--preprocessor" flag no longer supported Problem: MinGW: "--preprocessor" flag no longer supported. Solution: Remove the flag, use the defaults. (Christopher Wellons, closes #7741) diff --git a/src/GvimExt/Make_ming.mak b/src/GvimExt/Make_ming.mak --- a/src/GvimExt/Make_ming.mak +++ b/src/GvimExt/Make_ming.mak @@ -49,8 +49,8 @@ WINVER = 0x0501 endif CXX := $(CROSS_COMPILE)g++ WINDRES := $(CROSS_COMPILE)windres -WINDRES_CXX = $(CXX) -WINDRES_FLAGS = --preprocessor="$(WINDRES_CXX) -E -xc" -DRC_INVOKED +# this used to have --preprocessor, but it's no longer supported +WINDRES_FLAGS = LIBS := -luuid -lgdi32 RES := gvimext.res DEFFILE = gvimext_ming.def diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -220,7 +220,6 @@ WINDRES := $(CROSS_COMPILE)windres else WINDRES := windres endif -WINDRES_CC = $(CC) # Get the default ARCH. ifndef ARCH @@ -514,7 +513,8 @@ endif CFLAGS = -I. -Iproto $(DEFINES) -pipe -march=$(ARCH) -Wall CXXFLAGS = -std=gnu++11 -WINDRES_FLAGS = --preprocessor="$(WINDRES_CC) -E -xc" -DRC_INVOKED +# This used to have --preprocessor, but it's no longer supported +WINDRES_FLAGS = EXTRA_LIBS = ifdef GETTEXT diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2408, +/**/ 2407, /**/ 2406,