thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Make_mvc.mak
View File

@@ -38,7 +38,8 @@
# is yes) # is yes)
# Global IME support: GIME=yes (requires GUI=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) # Sound support: SOUND=yes (default is yes)
# #
@@ -109,13 +110,13 @@
# PostScript printing: POSTSCRIPT=yes (default is no) # PostScript printing: POSTSCRIPT=yes (default is no)
# #
# Netbeans Support: NETBEANS=[yes or no] (default is yes if GUI is yes) # Netbeans Support: NETBEANS=[yes or no] (default is yes if GUI is yes)
# Requires CHANNEL. # Requires CHANNEL.
# #
# Netbeans Debugging Support: NBDEBUG=[yes or no] (should be no, yes # Netbeans Debugging Support: NBDEBUG=[yes or no] (should be no, yes
# doesn't work) # doesn't work)
# #
# Inter process communication: CHANNEL=[yes or no] (default is yes if GUI # 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] # XPM Image Support: XPM=[path to XPM directory]
# Default is "xpm", using the files included in the distribution. # Default is "xpm", using the files included in the distribution.
@@ -388,7 +389,7 @@ NETBEANS = $(GUI)
!endif !endif
!ifndef CHANNEL !ifndef CHANNEL
! if "$(FEATURES)"=="HUGE" ! if "$(FEATURES)"=="HUGE" || "$(TERMINAL)"=="yes"
CHANNEL = yes CHANNEL = yes
! else ! else
CHANNEL = $(GUI) CHANNEL = $(GUI)

2
src/version.c
View File

@@ -738,6 +738,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 */
/**/
405,
/**/ /**/
404, 404,
/**/ /**/