summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRedirect 'Slash' NIL <redirect.slash.nil@gmail.com>2009-10-19 17:48:19 -0700
committerDavid Brownell <dbrownell@users.sourceforge.net>2009-10-19 17:48:19 -0700
commit0388a9c0e5c9724950d5a41e3b7cf83fa26a1898 (patch)
tree4365c6e25b0a7dd936cd0505d76c15525bb2175b
parent6ec1026bbb83f626484e4fd4b61aa1f7d864dbc7 (diff)
downloadopenocd+libswd-0388a9c0e5c9724950d5a41e3b7cf83fa26a1898.tar.gz
openocd+libswd-0388a9c0e5c9724950d5a41e3b7cf83fa26a1898.tar.bz2
openocd+libswd-0388a9c0e5c9724950d5a41e3b7cf83fa26a1898.tar.xz
openocd+libswd-0388a9c0e5c9724950d5a41e3b7cf83fa26a1898.zip
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.
-rw-r--r--src/Makefile.am2
1 files changed, 1 insertions, 1 deletions
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