changeset 8051:7e298e8c5741 v7.4.1320

commit https://github.com/vim/vim/commit/44d571868f4fcf000e8b03ee0a350f1f8131c9ca Author: Bram Moolenaar <Bram@vim.org> Date: Sun Feb 14 23:11:23 2016 +0100 patch 7.4.1320 Problem: Building with Cygwin or MingW with channel but without Netbeans doesn't work. Solution: Set NETBEANS to "no" when not used.
author Christian Brabandt <cb@256bit.org>
date Sun, 14 Feb 2016 23:15:05 +0100
parents b1c4aaa35206
children b377c49d3972
files src/Make_cyg_ming.mak src/version.c
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -679,8 +679,10 @@ ifneq ($(CHANNEL),yes)
 # Cannot use Netbeans without CHANNEL
 NETBEANS=no
 else
-# Only allow NETBEANS for a GUI build.
-ifeq (yes, $(GUI))
+ifneq (yes, $(GUI))
+# Cannot use Netbeans without GUI.
+NETBEANS=no
+else
 OBJ += $(OUTDIR)/netbeans.o
 LIB += -lwsock32
 endif
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1320,
+/**/
     1319,
 /**/
     1318,