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: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@42 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
sezero 2010-02-17 19:23:00 +00:00
parent 8ca380ba4d
commit 80d77aaaf6
2 changed files with 8 additions and 4 deletions

View file

@ -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))

View file

@ -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))