From 705eda52a1c95eab22583a23ac3ffa13f7bc9495 Mon Sep 17 00:00:00 2001 From: sezero Date: Thu, 18 Feb 2010 22:02:13 +0000 Subject: [PATCH] Makefile.w32, Makefile.w64: now that net_sdlnet.c is properly cleaned up and is not messing with socket api functions, windows versions no longer need linking to wsock32.dll or ws2_32.dll. git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@55 af15c1b1-3010-417e-b628-4374ebc0bcbd --- quakespasm/Quake/Makefile.w32 | 6 ++---- quakespasm/Quake/Makefile.w64 | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/quakespasm/Quake/Makefile.w32 b/quakespasm/Quake/Makefile.w32 index b5226fef..e0d1b6bd 100644 --- a/quakespasm/Quake/Makefile.w32 +++ b/quakespasm/Quake/Makefile.w32 @@ -49,10 +49,8 @@ SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags) SDL_LFLAGS := $(shell $(SDL_CONFIG) --libs) SDL_LIBS := SDL_net -# 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) + +COMMON_LIBS:= m opengl32 LIBS := $(patsubst %,-l%,$(COMMON_LIBS) $(SDL_LIBS)) diff --git a/quakespasm/Quake/Makefile.w64 b/quakespasm/Quake/Makefile.w64 index 1c72af95..b5cdb9e9 100644 --- a/quakespasm/Quake/Makefile.w64 +++ b/quakespasm/Quake/Makefile.w64 @@ -49,10 +49,8 @@ SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags) SDL_LFLAGS := $(shell $(SDL_CONFIG) --libs) SDL_LIBS := SDL_net -# 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) + +COMMON_LIBS:= m opengl32 LIBS := $(patsubst %,-l%,$(COMMON_LIBS) $(SDL_LIBS))