]> git.sur5r.net Git - openocd/commitdiff
MinGW: use WinSock2
authorRedirect 'Slash' NIL <redirect.slash.nil@gmail.com>
Tue, 20 Oct 2009 00:48:19 +0000 (17:48 -0700)
committerDavid Brownell <dbrownell@users.sourceforge.net>
Tue, 20 Oct 2009 00:48:19 +0000 (17:48 -0700)
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.

src/Makefile.am

index a223f9512fcef2a694d4c66790bf413bec62c41e..67179107c98fcfe7d759c39f8b5ee0339fac7f18 100644 (file)
@@ -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