0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

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)
This commit is contained in:
Bram Moolenaar
2021-01-25 19:18:02 +01:00
parent ab55f11d9b
commit 5c829bf229
3 changed files with 6 additions and 4 deletions

View File

@@ -49,8 +49,8 @@ WINVER = 0x0501
endif endif
CXX := $(CROSS_COMPILE)g++ CXX := $(CROSS_COMPILE)g++
WINDRES := $(CROSS_COMPILE)windres WINDRES := $(CROSS_COMPILE)windres
WINDRES_CXX = $(CXX) # this used to have --preprocessor, but it's no longer supported
WINDRES_FLAGS = --preprocessor="$(WINDRES_CXX) -E -xc" -DRC_INVOKED WINDRES_FLAGS =
LIBS := -luuid -lgdi32 LIBS := -luuid -lgdi32
RES := gvimext.res RES := gvimext.res
DEFFILE = gvimext_ming.def DEFFILE = gvimext_ming.def

View File

@@ -220,7 +220,6 @@ WINDRES := $(CROSS_COMPILE)windres
else else
WINDRES := windres WINDRES := windres
endif endif
WINDRES_CC = $(CC)
# Get the default ARCH. # Get the default ARCH.
ifndef ARCH ifndef ARCH
@@ -514,7 +513,8 @@ endif
CFLAGS = -I. -Iproto $(DEFINES) -pipe -march=$(ARCH) -Wall CFLAGS = -I. -Iproto $(DEFINES) -pipe -march=$(ARCH) -Wall
CXXFLAGS = -std=gnu++11 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 = EXTRA_LIBS =
ifdef GETTEXT ifdef GETTEXT

View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2408,
/**/ /**/
2407, 2407,
/**/ /**/