From 9d9354165cca6b01b15c189a08b0fabea5a011b0 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Wed, 17 Feb 2010 19:23:00 +0000 Subject: [PATCH] Makefile.w32, Makefile.w64: make sure to link to the correct winsock library, which must be what SDL_net.dll is already linked to, which is wsock32.dll for win32, and ws2_32.dll for win64 (mingw-w64.) git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@42 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/Makefile.w32 | 6 ++++-- Quake/Makefile.w64 | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Quake/Makefile.w32 b/Quake/Makefile.w32 index db2f8047..6c65e53c 100644 --- a/Quake/Makefile.w32 +++ b/Quake/Makefile.w32 @@ -49,8 +49,10 @@ SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags) SDL_LFLAGS := $(shell $(SDL_CONFIG) --libs) SDL_LIBS := SDL_net - -COMMON_LIBS:= m opengl32 ws2_32 +# link to what SDL_net.dll already is linked to: +# win32: wsock32.dll, win64 (mingw-w64): ws2_32.dll +NET_LIBS := wsock32 +COMMON_LIBS:= m opengl32 $(NET_LIBS) LIBS := $(patsubst %,-l%,$(COMMON_LIBS) $(SDL_LIBS)) diff --git a/Quake/Makefile.w64 b/Quake/Makefile.w64 index f3a34412..55bda920 100644 --- a/Quake/Makefile.w64 +++ b/Quake/Makefile.w64 @@ -49,8 +49,10 @@ SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags) SDL_LFLAGS := $(shell $(SDL_CONFIG) --libs) SDL_LIBS := SDL_net - -COMMON_LIBS:= m opengl32 ws2_32 +# link to what SDL_net.dll already is linked to: +# win32: wsock32.dll, win64 (mingw-w64): ws2_32.dll +NET_LIBS := ws2_32 +COMMON_LIBS:= m opengl32 $(NET_LIBS) LIBS := $(patsubst %,-l%,$(COMMON_LIBS) $(SDL_LIBS))