thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.1880

Browse Source 
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:
Bram Moolenaar
2016-06-02 20:26:41 +02:00
parent e38a2f7ebd
commit 76929af431
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Make_mvc.mak
View File

@@ -263,6 +263,10 @@ WP64CHECK = /Wp64
# INCLUDE = c:\msvc20\include # INCLUDE = c:\msvc20\include
# LIB = c:\msvc20\lib # LIB = c:\msvc20\lib
!if "$(FEATURES)"==""
FEATURES = HUGE
!endif
!ifndef CTAGS !ifndef CTAGS
CTAGS = ctags CTAGS = ctags
!endif !endif
@@ -283,8 +287,12 @@ NETBEANS = $(GUI)
!endif !endif
!ifndef CHANNEL !ifndef CHANNEL
!if "$(FEATURES)"=="HUGE"
CHANNEL = yes
!else
CHANNEL = $(GUI) CHANNEL = $(GUI)
!endif !endif
!endif
# Only allow NETBEANS and XPM for a GUI build and CHANNEL. # Only allow NETBEANS and XPM for a GUI build and CHANNEL.
!if "$(GUI)" == "yes" !if "$(GUI)" == "yes"
@@ -953,9 +961,6 @@ CFLAGS = $(CFLAGS) -DMSWINPS
# #
# FEATURES: TINY, SMALL, NORMAL, BIG or HUGE # FEATURES: TINY, SMALL, NORMAL, BIG or HUGE
# #
!if "$(FEATURES)"==""
FEATURES = HUGE
!endif
CFLAGS = $(CFLAGS) -DFEAT_$(FEATURES) CFLAGS = $(CFLAGS) -DFEAT_$(FEATURES)
# #

2
src/version.c
View File

@@ -753,6 +753,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1880,
/**/ /**/
1879, 1879,
/**/ /**/