Mercurial > vim
comparison src/Make_cyg_ming.mak @ 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 | b21c2a9dcd7d |
| children | e407d5bce2f5 |
comparison
equal
deleted
inserted
replaced
| 8050:b1c4aaa35206 | 8051:7e298e8c5741 |
|---|---|
| 677 ifeq ($(NETBEANS),yes) | 677 ifeq ($(NETBEANS),yes) |
| 678 ifneq ($(CHANNEL),yes) | 678 ifneq ($(CHANNEL),yes) |
| 679 # Cannot use Netbeans without CHANNEL | 679 # Cannot use Netbeans without CHANNEL |
| 680 NETBEANS=no | 680 NETBEANS=no |
| 681 else | 681 else |
| 682 # Only allow NETBEANS for a GUI build. | 682 ifneq (yes, $(GUI)) |
| 683 ifeq (yes, $(GUI)) | 683 # Cannot use Netbeans without GUI. |
| 684 NETBEANS=no | |
| 685 else | |
| 684 OBJ += $(OUTDIR)/netbeans.o | 686 OBJ += $(OUTDIR)/netbeans.o |
| 685 LIB += -lwsock32 | 687 LIB += -lwsock32 |
| 686 endif | 688 endif |
| 687 endif | 689 endif |
| 688 endif | 690 endif |