Mercurial > vim
diff src/Make_mvc.mak @ 19697:a8b2821181c2 v8.2.0405
patch 8.2.0405: MSVC: build fails with some combination of features
Commit: https://github.com/vim/vim/commit/3fa5e1326290e181215f805db17793f42cf73079
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Mar 19 13:36:56 2020 +0100
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 19 Mar 2020 13:45:04 +0100 |
| parents | 3e4c401a652f |
| children | 00a1b89256ea |
line wrap: on
line diff
--- 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)