Patch 8.2.2408

6 views
Skip to first unread message

Bram Moolenaar

unread,
Jan 25, 2021, 1:19:26 PM1/25/21
to vim...@googlegroups.com

Patch 8.2.2408
Problem: MinGW: "--preprocessor" flag no longer supported.
Solution: Remove the flag, use the defaults. (Christopher Wellons,
closes #7741)
Files: src/GvimExt/Make_ming.mak, src/Make_cyg_ming.mak


*** ../vim-8.2.2407/src/GvimExt/Make_ming.mak 2016-03-07 20:56:01.000000000 +0100
--- src/GvimExt/Make_ming.mak 2021-01-25 19:16:13.850152444 +0100
***************
*** 49,56 ****
endif
CXX := $(CROSS_COMPILE)g++
WINDRES := $(CROSS_COMPILE)windres
! WINDRES_CXX = $(CXX)
! WINDRES_FLAGS = --preprocessor="$(WINDRES_CXX) -E -xc" -DRC_INVOKED
LIBS := -luuid -lgdi32
RES := gvimext.res
DEFFILE = gvimext_ming.def
--- 49,56 ----
endif
CXX := $(CROSS_COMPILE)g++
WINDRES := $(CROSS_COMPILE)windres
! # this used to have --preprocessor, but it's no longer supported
! WINDRES_FLAGS =
LIBS := -luuid -lgdi32
RES := gvimext.res
DEFFILE = gvimext_ming.def
*** ../vim-8.2.2407/src/Make_cyg_ming.mak 2020-11-16 18:49:43.989459018 +0100
--- src/Make_cyg_ming.mak 2021-01-25 19:17:10.886019729 +0100
***************
*** 220,226 ****
else
WINDRES := windres
endif
- WINDRES_CC = $(CC)

# Get the default ARCH.
ifndef ARCH
--- 220,225 ----
***************
*** 514,520 ****

CFLAGS = -I. -Iproto $(DEFINES) -pipe -march=$(ARCH) -Wall
CXXFLAGS = -std=gnu++11
! WINDRES_FLAGS = --preprocessor="$(WINDRES_CC) -E -xc" -DRC_INVOKED
EXTRA_LIBS =

ifdef GETTEXT
--- 513,520 ----

CFLAGS = -I. -Iproto $(DEFINES) -pipe -march=$(ARCH) -Wall
CXXFLAGS = -std=gnu++11
! # This used to have --preprocessor, but it's no longer supported
! WINDRES_FLAGS =
EXTRA_LIBS =

ifdef GETTEXT
*** ../vim-8.2.2407/src/version.c 2021-01-25 18:44:40.781678226 +0100
--- src/version.c 2021-01-25 19:09:25.711063348 +0100
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 2408,
/**/

--
hundred-and-one symptoms of being an internet addict:
237. You tattoo your email address on your forehead.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Reply all
Reply to author
Forward
0 new messages