commit 97eba78f69ba68ce8e1fc72bbe762fc321e0a4b1
author Bram Moolenaar <Bram@vim.org> Mon Feb 15 22:45:12 2016 +0100
committer Bram Moolenaar <Bram@vim.org> Mon Feb 15 22:45:12 2016 +0100
tree c1d5a9506c303ace82593ef39f8e855a123b52ea
parent 2368917d8f0c0a997eac7a51ddfaa748dc528392

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)

src/Make_cyg_ming.mak

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 160fcd9..1c1ee8c 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -684,17 +684,14 @@
 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.

src/version.c

diff --git a/src/version.c b/src/version.c
index 8520ec5..bd13c6d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1326,
+/**/
     1325,
 /**/
     1324,