thodg/libgit2

2010-04-26T22:04:10

win32: Remove wsock32 from the list of libraries to link Commit 5dddf7c (Add block-sha1 in favour of the mozilla routines 2010-04-14) introduced the "bswap.h" header file which, for x86 or x86-64 machines, provides a "sane" implementation of ntohl() and htonl(). The wsock32 library, on the msvc and MinGW build, is only included in the link to supply the ntohl()/htonl() routines. Since we now have a built-in implementation, we can remove the wsock32 library from the link. [This will break a Windows build on a non-intel machine] Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>

diff --git a/tests/Makefile b/tests/Makefile
index beaa5ab..c059510 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -32,13 +32,13 @@ ifeq ($(uname_S),Windows)
 	LD_OUT=-out:
 	CC_OUT=-Fo
 
-	LIBS = ..\\libgit2.a libz.lib wsock32.lib
+	LIBS = ..\\libgit2.a libz.lib
 	CRYPTO_LIB = libeay32.lib
 endif
 
 ifneq (,$(findstring MINGW,$(uname_S)))
 	OS=win32
-	EXTRA_LIBS += -lwsock32 -lpthread
+	EXTRA_LIBS += -lpthread
 endif
 
 -include ../config.mak