From: Redirect 'Slash' NIL <redirect.slash.nil@gmail.com>
Date: Tue, 20 Oct 2009 00:48:19 +0000 (-0700)
Subject: MinGW: use WinSock2
X-Git-Tag: v0.3.0-rc0~66
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0388a9c0e5c9724950d5a41e3b7cf83fa26a1898;p=openocd

MinGW: use WinSock2

After reading a bit further, it appears that ws2_32 (Windows Sockets 2)
is included in all versions of Windows and backwards compatible with
wsock32, at least according to

 http://msdn.microsoft.com/en-us/library/ms740673%28VS.85%29.aspx.

Only Win95 seems to require a manual installation; is not a big deal.

So I think we can drop this whole business of detecting 64 bit MinGW and
just use -lws2_32 for all MinGW platforms.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index a223f951..67179107 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,7 +43,7 @@ libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS)
 libopenocd_la_LDFLAGS = $(all_libraries)
 
 if IS_MINGW
-MINGWLDADD = -lwsock32
+MINGWLDADD = -lws2_32
 else
 MINGWLDADD =
 endif