Mercurial > vim

comparison src/Make_mvc.mak @ 19697:a8b2821181c2 v8.2.0405

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
19696:eb4f402c2aaa 19697:a8b2821181c2
36 # IME support: IME=yes (default is yes) 36 # IME support: IME=yes (default is yes)
37 # DYNAMIC_IME=[yes or no] (to load the imm32.dll dynamically, default 37 # DYNAMIC_IME=[yes or no] (to load the imm32.dll dynamically, default
38 # is yes) 38 # is yes)
39 # Global IME support: GIME=yes (requires GUI=yes) 39 # Global IME support: GIME=yes (requires GUI=yes)
40 # 40 #
41 # Terminal support: TERMINAL=yes (default is yes) 41 # Terminal support: TERMINAL=yes (default is yes if FEATURES is HUGE)
42 # Will also enable CHANNEL
42 # 43 #
43 # Sound support: SOUND=yes (default is yes) 44 # Sound support: SOUND=yes (default is yes)
44 # 45 #
45 # DLL support (EXPERIMENTAL): VIMDLL=yes (default is no) 46 # DLL support (EXPERIMENTAL): VIMDLL=yes (default is no)
46 # Creates vim{32,64}.dll, and stub gvim.exe and vim.exe. 47 # Creates vim{32,64}.dll, and stub gvim.exe and vim.exe.
107 # See http://sourceforge.net/projects/gettext/ 108 # See http://sourceforge.net/projects/gettext/
108 # 109 #
109 # PostScript printing: POSTSCRIPT=yes (default is no) 110 # PostScript printing: POSTSCRIPT=yes (default is no)
110 # 111 #
111 # Netbeans Support: NETBEANS=[yes or no] (default is yes if GUI is yes) 112 # Netbeans Support: NETBEANS=[yes or no] (default is yes if GUI is yes)
112 # Requires CHANNEL. 113 # Requires CHANNEL.
113 # 114 #
114 # Netbeans Debugging Support: NBDEBUG=[yes or no] (should be no, yes 115 # Netbeans Debugging Support: NBDEBUG=[yes or no] (should be no, yes
115 # doesn't work) 116 # doesn't work)
116 # 117 #
117 # Inter process communication: CHANNEL=[yes or no] (default is yes if GUI 118 # Inter process communication: CHANNEL=[yes or no] (default is yes if GUI
118 # is yes) 119 # is yes or TERMINAL is yes)
119 # 120 #
120 # XPM Image Support: XPM=[path to XPM directory] 121 # XPM Image Support: XPM=[path to XPM directory]
121 # Default is "xpm", using the files included in the distribution. 122 # Default is "xpm", using the files included in the distribution.
122 # Use "no" to disable this feature. 123 # Use "no" to disable this feature.
123 # 124 #
386 !ifndef NETBEANS 387 !ifndef NETBEANS
387 NETBEANS = $(GUI) 388 NETBEANS = $(GUI)
388 !endif 389 !endif
389 390
390 !ifndef CHANNEL 391 !ifndef CHANNEL
391 ! if "$(FEATURES)"=="HUGE" 392 ! if "$(FEATURES)"=="HUGE" || "$(TERMINAL)"=="yes"
392 CHANNEL = yes 393 CHANNEL = yes
393 ! else 394 ! else
394 CHANNEL = $(GUI) 395 CHANNEL = $(GUI)
395 ! endif 396 ! endif
396 !endif 397 !endif