Skip to content

Commit 5c829bf

Browse files
committed
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)
1 parent ab55f11 commit 5c829bf

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/GvimExt/Make_ming.mak

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ WINVER = 0x0501
4949
endif
5050
CXX := $(CROSS_COMPILE)g++
5151
WINDRES := $(CROSS_COMPILE)windres
52-
WINDRES_CXX = $(CXX)
53-
WINDRES_FLAGS = --preprocessor="$(WINDRES_CXX) -E -xc" -DRC_INVOKED
52+
# this used to have --preprocessor, but it's no longer supported
53+
WINDRES_FLAGS =
5454
LIBS := -luuid -lgdi32
5555
RES := gvimext.res
5656
DEFFILE = gvimext_ming.def

src/Make_cyg_ming.mak

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ WINDRES := $(CROSS_COMPILE)windres
220220
else
221221
WINDRES := windres
222222
endif
223-
WINDRES_CC = $(CC)
224223

225224
# Get the default ARCH.
226225
ifndef ARCH
@@ -514,7 +513,8 @@ endif
514513

515514
CFLAGS = -I. -Iproto $(DEFINES) -pipe -march=$(ARCH) -Wall
516515
CXXFLAGS = -std=gnu++11
517-
WINDRES_FLAGS = --preprocessor="$(WINDRES_CC) -E -xc" -DRC_INVOKED
516+
# This used to have --preprocessor, but it's no longer supported
517+
WINDRES_FLAGS =
518518
EXTRA_LIBS =
519519

520520
ifdef GETTEXT

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,8 @@ static char *(features[]) =
750750

751751
static int included_patches[] =
752752
{ /* Add new patch number below this line */
753+
/**/
754+
2408,
753755
/**/
754756
2407,
755757
/**/

0 commit comments

Comments
 (0)