diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 841dbd4ef..c4529b72b 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -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) # diff --git a/src/version.c b/src/version.c index 7373e70dd..9cf3972cb 100644 --- a/src/version.c +++ b/src/version.c @@ -753,6 +753,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1880, /**/ 1879, /**/