1
0
forked from aniani/vim

patch 8.2.0405: MSVC: build fails with some combination of features

Problem:    MSVC: build fails with some combination of features.
Solution:   Enable CHANNEL if TERMINAL is enabled. (Mike Williams)
This commit is contained in:
Bram Moolenaar
2020-03-19 13:36:56 +01:00
parent 18a2b87ca2
commit 3fa5e13262
2 changed files with 7 additions and 4 deletions

View File

@@ -38,7 +38,8 @@
# is yes)
# Global IME support: GIME=yes (requires GUI=yes)
#
# Terminal support: TERMINAL=yes (default is yes)
# Terminal support: TERMINAL=yes (default is yes if FEATURES is HUGE)
# Will also enable CHANNEL
#
# Sound support: SOUND=yes (default is yes)
#
@@ -115,7 +116,7 @@
# doesn't work)
#
# Inter process communication: CHANNEL=[yes or no] (default is yes if GUI
# is yes)
# is yes or TERMINAL is yes)
#
# XPM Image Support: XPM=[path to XPM directory]
# Default is "xpm", using the files included in the distribution.
@@ -388,7 +389,7 @@ NETBEANS = $(GUI)
!endif
!ifndef CHANNEL
! if "$(FEATURES)"=="HUGE"
! if "$(FEATURES)"=="HUGE" || "$(TERMINAL)"=="yes"
CHANNEL = yes
! else
CHANNEL = $(GUI)

View File

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