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)

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 160fcd9c07118ff9fb8d7bdf95bf03bbe877ea40..1c1ee8c649426c03e0b8d0df6cb9bdde9b6df3c1 100644 (file)
--- 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 8520ec5153c8e9861dcda0f3ced55d7b8874d783..bd13c6d4450a4429440c4a3581ccd5a16a5d9f54 100644 (file)
--- 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,
 /**/