From 97eba78f69ba68ce8e1fc72bbe762fc321e0a4b1 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 15 Feb 2016 22:45:12 +0100 Subject: [PATCH] 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 | 3 --- src/version.c | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 160fcd9c07..1c1ee8c649 100644 --- 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. diff --git a/src/version.c b/src/version.c index 8520ec5153..bd13c6d445 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1326, /**/ 1325, /**/ -- 2.47.2