summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-03-19 13:36:56 +0100
committerBram Moolenaar <Bram@vim.org>2020-03-19 13:36:56 +0100
commit3fa5e1326290e181215f805db17793f42cf73079 (patch)
tree9e5a7ea07cd15fff73852a98013efa66f4aefc3d
parent18a2b87ca27c378a555b20f14a284d2ce3511427 (diff)
downloadvim-git-3fa5e1326290e181215f805db17793f42cf73079.tar.gz
patch 8.2.0405: MSVC: build fails with some combination of featuresv8.2.0405
Problem: MSVC: build fails with some combination of features. Solution: Enable CHANNEL if TERMINAL is enabled. (Mike Williams)
-rw-r--r--src/Make_mvc.mak9
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 4 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 5be53cf6a..a6825d582 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -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)
#
@@ -109,13 +110,13 @@
# PostScript printing: POSTSCRIPT=yes (default is no)
#
# 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
# 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)
diff --git a/src/version.c b/src/version.c
index b709dbbf8..ed2f86dcb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 405,
+/**/
404,
/**/
403,