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

patch 7.4.1320

Browse Source 
Problem:    Building with Cygwin or MingW with channel but without Netbeans
            doesn't work.
Solution:   Set NETBEANS to "no" when not used.
This commit is contained in:
Bram Moolenaar
2016-02-14 23:11:23 +01:00
parent 16eb4f8800
commit 44d571868f
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Make_cyg_ming.mak
View File

@@ -679,8 +679,10 @@ ifneq ($(CHANNEL),yes)
# Cannot use Netbeans without CHANNEL # Cannot use Netbeans without CHANNEL
NETBEANS=no NETBEANS=no
else else
# Only allow NETBEANS for a GUI build. ifneq (yes, $(GUI))
ifeq (yes, $(GUI)) # Cannot use Netbeans without GUI.
NETBEANS=no
else
OBJ += $(OUTDIR)/netbeans.o OBJ += $(OUTDIR)/netbeans.o
LIB += -lwsock32 LIB += -lwsock32
endif endif

2
src/version.c
View File

@@ -747,6 +747,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 */
/**/
1320,
/**/ /**/
1319, 1319,
/**/ /**/