From dfe67b4e7eaf0870ca2e51f0b9c475a2cbee8e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20St=C3=B6neberg?= Date: Mon, 29 Dec 2014 20:38:18 +0100 Subject: fixed linking on FreeBSD (nw) also simplified network part in sdl.mak a bit --- src/osd/sdl/sdl.mak | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak index c4bf78f3a92..6b3ab1f1fbd 100644 --- a/src/osd/sdl/sdl.mak +++ b/src/osd/sdl/sdl.mak @@ -768,17 +768,17 @@ endif # USE_XINPUT # Network (TAP/TUN) #------------------------------------------------- +OSDOBJS += $(SDLOBJ)/netdev.o + ifndef DONT_USE_NETWORK + ifeq ($(SDL_NETWORK),taptun) -OSDOBJS += \ - $(SDLOBJ)/netdev.o \ - $(SDLOBJ)/netdev_tap.o +OSDOBJS += $(SDLOBJ)/netdev_tap.o DEFS += -DSDLMAME_NETWORK -DSDLMAME_NET_TAPTUN endif ifeq ($(SDL_NETWORK),pcap) -OSDOBJS += $(SDLOBJ)/netdev.o ifeq ($(TARGETOS),macosx) OSDOBJS += $(SDLOBJ)/netdev_pcap_osx.o @@ -787,13 +787,14 @@ OSDOBJS += $(SDLOBJ)/netdev_pcap.o endif DEFS += -DSDLMAME_NETWORK -DSDLMAME_NET_PCAP + ifneq ($(TARGETOS),win32) LIBS += -lpcap endif -endif -else -OSDOBJS += $(SDLOBJ)/netdev.o -endif + +endif # ifeq ($(SDL_NETWORK),pcap) + +endif # ifndef DONT_USE_NETWORK #------------------------------------------------- # Dependencies -- cgit v1.2.3