fixed linking on FreeBSD (nw)

also simplified network part in sdl.mak a bit
This commit is contained in:
Oliver Stöneberg 2014-12-29 20:38:18 +01:00
parent 0bd97a7c13
commit dfe67b4e7e

View File

@ -768,17 +768,17 @@ endif # USE_XINPUT
# Network (TAP/TUN) # Network (TAP/TUN)
#------------------------------------------------- #-------------------------------------------------
OSDOBJS += $(SDLOBJ)/netdev.o
ifndef DONT_USE_NETWORK ifndef DONT_USE_NETWORK
ifeq ($(SDL_NETWORK),taptun) ifeq ($(SDL_NETWORK),taptun)
OSDOBJS += \ OSDOBJS += $(SDLOBJ)/netdev_tap.o
$(SDLOBJ)/netdev.o \
$(SDLOBJ)/netdev_tap.o
DEFS += -DSDLMAME_NETWORK -DSDLMAME_NET_TAPTUN DEFS += -DSDLMAME_NETWORK -DSDLMAME_NET_TAPTUN
endif endif
ifeq ($(SDL_NETWORK),pcap) ifeq ($(SDL_NETWORK),pcap)
OSDOBJS += $(SDLOBJ)/netdev.o
ifeq ($(TARGETOS),macosx) ifeq ($(TARGETOS),macosx)
OSDOBJS += $(SDLOBJ)/netdev_pcap_osx.o OSDOBJS += $(SDLOBJ)/netdev_pcap_osx.o
@ -787,13 +787,14 @@ OSDOBJS += $(SDLOBJ)/netdev_pcap.o
endif endif
DEFS += -DSDLMAME_NETWORK -DSDLMAME_NET_PCAP DEFS += -DSDLMAME_NETWORK -DSDLMAME_NET_PCAP
ifneq ($(TARGETOS),win32) ifneq ($(TARGETOS),win32)
LIBS += -lpcap LIBS += -lpcap
endif endif
endif
else endif # ifeq ($(SDL_NETWORK),pcap)
OSDOBJS += $(SDLOBJ)/netdev.o
endif endif # ifndef DONT_USE_NETWORK
#------------------------------------------------- #-------------------------------------------------
# Dependencies # Dependencies