Mercurial > vim
comparison src/Make_cyg_ming.mak @ 8064:1e853c5273d0 v7.4.1326
commit https://github.com/vim/vim/commit/97eba78f69ba68ce8e1fc72bbe762fc321e0a4b1
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Feb 15 22:45:12 2016 +0100
patch 7.4.1326
Problem: Build rules are bit too complicated.
Solution: Remove -lwsock32 from Netbeans, it's already added for the channel
feature that it depends on. (Tony Mechelynck)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 15 Feb 2016 23:00:05 +0100 |
| parents | e407d5bce2f5 |
| children | 3b0127287851 |
comparison
equal
deleted
inserted
replaced
| 8063:b158efd26f38 | 8064:1e853c5273d0 |
|---|---|
| 682 ifneq (yes, $(GUI)) | 682 ifneq (yes, $(GUI)) |
| 683 # Cannot use Netbeans without GUI. | 683 # Cannot use Netbeans without GUI. |
| 684 NETBEANS=no | 684 NETBEANS=no |
| 685 else | 685 else |
| 686 OBJ += $(OUTDIR)/netbeans.o | 686 OBJ += $(OUTDIR)/netbeans.o |
| 687 LIB += -lwsock32 | |
| 688 endif | 687 endif |
| 689 endif | 688 endif |
| 690 endif | 689 endif |
| 691 | 690 |
| 692 ifeq ($(CHANNEL),yes) | 691 ifeq ($(CHANNEL),yes) |
| 693 OBJ += $(OUTDIR)/channel.o | 692 OBJ += $(OUTDIR)/channel.o |
| 694 ifneq ($(NETBEANS),yes) | |
| 695 LIB += -lwsock32 | 693 LIB += -lwsock32 |
| 696 endif | |
| 697 endif | 694 endif |
| 698 | 695 |
| 699 ifeq ($(DIRECTX),yes) | 696 ifeq ($(DIRECTX),yes) |
| 700 # Only allow DIRECTX for a GUI build. | 697 # Only allow DIRECTX for a GUI build. |
| 701 ifeq (yes, $(GUI)) | 698 ifeq (yes, $(GUI)) |