forked from aniani/vim
patch 7.4.1880
Problem: MS-Windows console build defaults to not having +channel. Solution: Include the channel feature if building with huge features.
This commit is contained in:
@@ -263,6 +263,10 @@ WP64CHECK = /Wp64
|
||||
# INCLUDE = c:\msvc20\include
|
||||
# LIB = c:\msvc20\lib
|
||||
|
||||
!if "$(FEATURES)"==""
|
||||
FEATURES = HUGE
|
||||
!endif
|
||||
|
||||
!ifndef CTAGS
|
||||
CTAGS = ctags
|
||||
!endif
|
||||
@@ -283,8 +287,12 @@ NETBEANS = $(GUI)
|
||||
!endif
|
||||
|
||||
!ifndef CHANNEL
|
||||
!if "$(FEATURES)"=="HUGE"
|
||||
CHANNEL = yes
|
||||
!else
|
||||
CHANNEL = $(GUI)
|
||||
!endif
|
||||
!endif
|
||||
|
||||
# Only allow NETBEANS and XPM for a GUI build and CHANNEL.
|
||||
!if "$(GUI)" == "yes"
|
||||
@@ -953,9 +961,6 @@ CFLAGS = $(CFLAGS) -DMSWINPS
|
||||
#
|
||||
# FEATURES: TINY, SMALL, NORMAL, BIG or HUGE
|
||||
#
|
||||
!if "$(FEATURES)"==""
|
||||
FEATURES = HUGE
|
||||
!endif
|
||||
CFLAGS = $(CFLAGS) -DFEAT_$(FEATURES)
|
||||
|
||||
#
|
||||
|
@@ -753,6 +753,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1880,
|
||||
/**/
|
||||
1879,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user