mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5953 from orbea/miniupnpc

Browse Source 
Makefile.common: Clean up the miniupnpc check
This commit is contained in:
Twinaphex 2017-12-26 09:41:08 +01:00 committed by GitHub
commit d3fd5f25d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Makefile.common
View File

@ -1525,27 +1525,24 @@ ifeq ($(HAVE_NETWORKING), 1)
cores/libretro-net-retropad/net_retropad_core.o cores/libretro-net-retropad/net_retropad_core.o
endif endif
ifeq ($(HAVE_MINIUPNPC), 1) ifeq ($(HAVE_BUILTINMINIUPNPC), 1)
ifeq ($(HAVE_BUILTINMINIUPNPC), 1) DEFINES += -DHAVE_BUILTINMINIUPNPC -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR
DEFINES += -DHAVE_BUILTINMINIUPNPC -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR DEFINES += -I$(DEPS_DIR)
DEFINES += -I$(DEPS_DIR) OBJ += $(DEPS_DIR)/miniupnpc/igd_desc_parse.o \
OBJ += \ $(DEPS_DIR)/miniupnpc/upnpreplyparse.o \
$(DEPS_DIR)/miniupnpc/igd_desc_parse.o \ $(DEPS_DIR)/miniupnpc/upnpcommands.o \
$(DEPS_DIR)/miniupnpc/upnpreplyparse.o \ $(DEPS_DIR)/miniupnpc/upnperrors.o \
$(DEPS_DIR)/miniupnpc/upnpcommands.o \ $(DEPS_DIR)/miniupnpc/connecthostport.o \
$(DEPS_DIR)/miniupnpc/upnperrors.o \ $(DEPS_DIR)/miniupnpc/portlistingparse.o \
$(DEPS_DIR)/miniupnpc/connecthostport.o \ $(DEPS_DIR)/miniupnpc/receivedata.o \
$(DEPS_DIR)/miniupnpc/portlistingparse.o \ $(DEPS_DIR)/miniupnpc/upnpdev.o \
$(DEPS_DIR)/miniupnpc/receivedata.o \ $(DEPS_DIR)/miniupnpc/minissdpc.o \
$(DEPS_DIR)/miniupnpc/upnpdev.o \ $(DEPS_DIR)/miniupnpc/miniwget.o \
$(DEPS_DIR)/miniupnpc/minissdpc.o \ $(DEPS_DIR)/miniupnpc/miniupnpc.o \
$(DEPS_DIR)/miniupnpc/miniwget.o \ $(DEPS_DIR)/miniupnpc/minixml.o \
$(DEPS_DIR)/miniupnpc/miniupnpc.o \ $(DEPS_DIR)/miniupnpc/minisoap.o
$(DEPS_DIR)/miniupnpc/minixml.o \ else ifeq ($(HAVE_MINIUPNPC), 1)
$(DEPS_DIR)/miniupnpc/minisoap.o LIBS += $(MINIUPNPC_LIBS)
else
LIBS += $(MINIUPNPC_LIBS)
endif
endif endif
endif endif

6
qb/config.libs.sh
View File

@ -195,13 +195,9 @@ if [ "$HAVE_NETWORKING" = 'yes' ]; then
HAVE_NETWORK_CMD=yes HAVE_NETWORK_CMD=yes
HAVE_NETWORKGAMEPAD=yes HAVE_NETWORKGAMEPAD=yes
if [ "$HAVE_MINIUPNPC" != "no" ]; then if [ "$HAVE_BUILTINMINIUPNPC" != "yes" ]; then
check_lib '' MINIUPNPC "-lminiupnpc" check_lib '' MINIUPNPC "-lminiupnpc"
fi fi
if [ "$HAVE_BUILTINMINIUPNPC" = "yes" ]; then
HAVE_MINIUPNPC='yes'
fi
else else
die : 'Warning: All networking features have been disabled.' die : 'Warning: All networking features have been disabled.'
HAVE_KEYMAPPER='no' HAVE_KEYMAPPER='no'