summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Make_cyg_ming.mak5
-rw-r--r--src/Make_mvc.mak10
-rw-r--r--src/version.c2
3 files changed, 16 insertions, 1 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index a855f066e..87de4e9a0 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -47,6 +47,7 @@ FEATURES=HUGE
# Set to yes to cross-compile from unix; no=native Windows (and Cygwin).
CROSS=no
# Set to path to iconv.h and libiconv.a to enable using 'iconv.dll'.
+# Use "yes" when the path does not need to be define.
#ICONV="."
ICONV=yes
GETTEXT=yes
@@ -74,7 +75,11 @@ else
CHANNEL=$(GUI)
endif
# Set to yes to enable terminal support.
+ifeq (HUGE, $(FEATURES))
+TERMINAL=yes
+else
TERMINAL=no
+endif
ifndef CTAGS
# this assumes ctags is Exuberant ctags
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 478bf69dc..30a52f4b9 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -37,7 +37,7 @@
# is yes)
# Global IME support: GIME=yes (requires GUI=yes)
#
-# Terminal support: TERMINAL=yes (default is no)
+# Terminal support: TERMINAL=yes (default is yes)
#
# Lua interface:
# LUA=[Path to Lua directory]
@@ -361,6 +361,14 @@ CSCOPE_OBJ = $(OBJDIR)/if_cscope.obj
CSCOPE_DEFS = -DFEAT_CSCOPE
!endif
+!ifndef TERMINAL
+!if "$(FEATURES)"=="HUGE"
+TERMINAL = yes
+!else
+TERMINAL = no
+!endif
+!endif
+
!if "$(TERMINAL)" == "yes"
TERM_OBJ = \
$(OBJDIR)/terminal.obj \
diff --git a/src/version.c b/src/version.c
index a119dc881..d16baeb27 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1192,
+/**/
1191,
/**/
1190,