diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-14 23:11:23 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-14 23:11:23 +0100 |
| commit | 44d571868f4fcf000e8b03ee0a350f1f8131c9ca (patch) | |
| tree | 0ea15374aaedc8bfd7bde2cd59016672e99e1205 | |
| parent | 16eb4f88000cfdba68df6c421fe44e7e029ba53e (diff) | |
| download | vim-git-44d571868f4fcf000e8b03ee0a350f1f8131c9ca.tar.gz | |
patch 7.4.1320v7.4.1320
Problem: Building with Cygwin or MingW with channel but without Netbeans
doesn't work.
Solution: Set NETBEANS to "no" when not used.
| -rw-r--r-- | src/Make_cyg_ming.mak | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 026c966bf..28d31d612 100644 --- 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 diff --git a/src/version.c b/src/version.c index c047848fa..a380ed341 100644 --- 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, |