changeset 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 b158efd26f38
children edbf9c5fe379
files src/Make_cyg_ming.mak src/version.c
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -684,17 +684,14 @@ ifneq (yes, $(GUI))
 NETBEANS=no
 else
 OBJ += $(OUTDIR)/netbeans.o
-LIB += -lwsock32
 endif
 endif
 endif
 
 ifeq ($(CHANNEL),yes)
 OBJ += $(OUTDIR)/channel.o
-ifneq ($(NETBEANS),yes)
 LIB += -lwsock32
 endif
-endif
 
 ifeq ($(DIRECTX),yes)
 # Only allow DIRECTX for a GUI build.
--- 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 */
 /**/
+    1326,
+/**/
     1325,
 /**/
     1324,