diff --git a/Makefile.common b/Makefile.common index 786682b785..ed3e376c4f 100644 --- a/Makefile.common +++ b/Makefile.common @@ -1580,49 +1580,54 @@ else ifeq ($(HAVE_FLAC),1) LIBS += $(FLAC_LIBS) endif -ifeq ($(HAVE_ZLIB), 1) +ifeq ($(HAVE_BUILTINZLIB), 1) + HAVE_ZLIB_COMMON = 1 + OBJ += $(DEPS_DIR)/libz/adler32.o \ + $(DEPS_DIR)/libz/compress.o \ + $(DEPS_DIR)/libz/libz-crc32.o \ + $(DEPS_DIR)/libz/deflate.o \ + $(DEPS_DIR)/libz/gzclose.o \ + $(DEPS_DIR)/libz/gzlib.o \ + $(DEPS_DIR)/libz/gzread.o \ + $(DEPS_DIR)/libz/gzwrite.o \ + $(DEPS_DIR)/libz/inffast.o \ + $(DEPS_DIR)/libz/inflate.o \ + $(DEPS_DIR)/libz/inftrees.o \ + $(DEPS_DIR)/libz/trees.o \ + $(DEPS_DIR)/libz/uncompr.o \ + $(DEPS_DIR)/libz/zutil.o + INCLUDE_DIRS += -I$(LIBRETRO_COMM_DIR)/include/compat/zlib + DEFINES += -DWANT_ZLIB +else + HAVE_ZLIB_COMMON = 1 + LIBS += $(ZLIB_LIBS) +endif + +ifeq ($(HAVE_ZLIB_COMMON), 1) OBJ += $(LIBRETRO_COMM_DIR)/file/archive_file_zlib.o \ $(LIBRETRO_COMM_DIR)/streams/trans_stream_zlib.o DEFINES += -DHAVE_ZLIB HAVE_COMPRESSION = 1 - ifeq ($(HAVE_BUILTINZLIB), 1) - OBJ += $(DEPS_DIR)/libz/adler32.o \ - $(DEPS_DIR)/libz/compress.o \ - $(DEPS_DIR)/libz/libz-crc32.o \ - $(DEPS_DIR)/libz/deflate.o \ - $(DEPS_DIR)/libz/gzclose.o \ - $(DEPS_DIR)/libz/gzlib.o \ - $(DEPS_DIR)/libz/gzread.o \ - $(DEPS_DIR)/libz/gzwrite.o \ - $(DEPS_DIR)/libz/inffast.o \ - $(DEPS_DIR)/libz/inflate.o \ - $(DEPS_DIR)/libz/inftrees.o \ - $(DEPS_DIR)/libz/trees.o \ - $(DEPS_DIR)/libz/uncompr.o \ - $(DEPS_DIR)/libz/zutil.o - INCLUDE_DIRS += -I$(LIBRETRO_COMM_DIR)/include/compat/zlib - DEFINES += -DWANT_ZLIB - else - LIBS += $(ZLIB_LIBS) - endif -ifeq ($(HAVE_CHD), 1) - DEF_FLAGS += -I$(LIBRETRO_COMM_DIR)/formats/libchdr - DEFINES += -DHAVE_CHD -DWANT_SUBCODE -DWANT_RAW_DATA_SECTOR - OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_bitstream.o \ - $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_cdrom.o \ - $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_chd.o \ - $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_huffman.o \ - $(LIBRETRO_COMM_DIR)/streams/chd_stream.o - OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_zlib.o - ifeq ($(HAVE_FLAC),1) - OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_flac.o \ - $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_flac_codec.o + ifeq ($(HAVE_CHD), 1) + DEF_FLAGS += -I$(LIBRETRO_COMM_DIR)/formats/libchdr + DEFINES += -DHAVE_CHD -DWANT_SUBCODE -DWANT_RAW_DATA_SECTOR + OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_bitstream.o \ + $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_cdrom.o \ + $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_chd.o \ + $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_huffman.o \ + $(LIBRETRO_COMM_DIR)/streams/chd_stream.o \ + $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_zlib.o + + ifeq ($(HAVE_FLAC),1) + OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_flac.o \ + $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_flac_codec.o + endif + + ifeq ($(HAVE_7ZIP), 1) + OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_lzma.o + endif endif - ifeq ($(HAVE_7ZIP), 1) - OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_lzma.o - endif -endif endif ifeq ($(HAVE_RTGA), 1) @@ -1652,10 +1657,6 @@ OBJ += $(LIBRETRO_COMM_DIR)/formats/bmp/rbmp_encode.o \ $(LIBRETRO_COMM_DIR)/formats/xml/rxml.o \ $(LIBRETRO_COMM_DIR)/formats/image_transfer.o -ifdef HAVE_COMPRESSION - DEFINES += -DHAVE_COMPRESSION -endif - # Easter Egg ifeq ($(HAVE_EASTEREGG),1) DEFINES += -DHAVE_EASTEREGG diff --git a/command.c b/command.c index 71bd59e65c..9a1f580276 100755 --- a/command.c +++ b/command.c @@ -2793,7 +2793,6 @@ TODO: Add a setting for these tweaks */ case CMD_EVENT_NETPLAY_INIT: case CMD_EVENT_NETPLAY_INIT_DIRECT: case CMD_EVENT_NETPLAY_INIT_DIRECT_DEFERRED: - case CMD_EVENT_NETPLAY_GAME_WATCH: case CMD_EVENT_NETPLAY_HOST_TOGGLE: case CMD_EVENT_NETPLAY_DISCONNECT: case CMD_EVENT_NETPLAY_ENABLE_HOST: diff --git a/qb/config.libs.sh b/qb/config.libs.sh index 71b85d1221..d8d3e3f1e0 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -145,7 +145,7 @@ fi check_lib '' NETWORKING "$SOCKETLIB" socket "" "$SOCKETHEADER" -if [ "$HAVE_NETWORKING" = 'yes' ]; then +if [ "$HAVE_NETWORKING" != 'no' ]; then HAVE_GETADDRINFO=auto HAVE_SOCKET_LEGACY=no @@ -159,24 +159,22 @@ if [ "$HAVE_NETWORKING" = 'yes' ]; then die : 'Notice: RetroArch will use legacy socket support' fi fi + HAVE_NETWORK_CMD=yes - HAVE_NETWORKGAMEPAD=yes - - if [ "$HAVE_MINIUPNPC" = 'no' ]; then - HAVE_BUILTINMINIUPNPC=no - fi - - check_lib '' MINIUPNPC '-lminiupnpc' else - die : 'Warning: All networking features have been disabled.' - HAVE_NETWORK_CMD='no' - HAVE_NETWORKGAMEPAD='no' - HAVE_CHEEVOS='no' - HAVE_DISCORD='no' - HAVE_TRANSLATE='no' - HAVE_SSL='no' + HAVE_NETWORK_CMD=no fi +check_enabled NETWORKING CHEEVOS cheevos 'Networking is' false +check_enabled NETWORKING DISCORD discord 'Networking is' false +check_enabled NETWORKING MINIUPNPC miniupnpc 'Networking is' false +check_enabled NETWORKING SSL ssl 'Networking is' false +check_enabled NETWORKING TRANSLATE OCR 'Networking is' false + +check_enabled NETWORKING NETWORKGAMEPAD 'the networked game pad' 'Networking is' true +check_enabled MINIUPNPC BUILTINMINIUPNPC 'builtin miniupnpc' 'miniupnpc is' true + +check_lib '' MINIUPNPC '-lminiupnpc' check_lib '' STDIN_CMD "$CLIB" fcntl if [ "$HAVE_NETWORK_CMD" = "yes" ] || [ "$HAVE_STDIN_CMD" = "yes" ]; then @@ -260,15 +258,11 @@ if [ "$HAVE_QT" != 'no' ]; then check_pkgconf OPENSSL openssl 1.0.0 fi -if [ "$HAVE_FLAC" = 'no' ]; then - HAVE_BUILTINFLAC=no -fi +check_enabled FLAC BUILTINFLAC 'builtin flac' 'flac is' true check_val '' FLAC '-lFLAC' '' flac '' '' false -if [ "$HAVE_SSL" = 'no' ]; then - HAVE_BUILTINMBEDTLS=no -fi +check_enabled SSL BUILTINMBEDTLS 'builtin mbedtls' 'ssl is' true if [ "$HAVE_SSL" != 'no' ]; then check_header MBEDTLS \ @@ -370,14 +364,9 @@ elif [ "$HAVE_OPENGLES" != 'no' ] && [ "$HAVE_OPENGLES3" != 'yes' ]; then HAVE_OPENGL_CORE='no' fi -if [ "$HAVE_ZLIB" = 'no' ]; then - HAVE_BUILTINZLIB=no -elif [ "$HAVE_BUILTINZLIB" = 'yes' ]; then - HAVE_ZLIB=yes -else - check_val '' ZLIB '-lz' '' zlib '' '' false -fi +check_enabled ZLIB BUILTINZLIB 'builtin zlib' 'zlib is' true +check_val '' ZLIB '-lz' '' zlib '' '' false check_val '' MPV -lmpv '' mpv '' '' false check_header DRMINGW exchndl.h diff --git a/qb/config.params.sh b/qb/config.params.sh index 2dbe45230a..157ca0117a 100644 --- a/qb/config.params.sh +++ b/qb/config.params.sh @@ -18,7 +18,7 @@ HAVE_STRIPES=no # Stripes menu HAVE_RUNAHEAD=yes # Runahead support HAVE_SSL=auto # SSL/mbedtls support C89_SSL=no -HAVE_BUILTINMBEDTLS=yes # Bake in the mbedtls library +HAVE_BUILTINMBEDTLS=auto # Bake in the mbedtls library C89_BUILTINMBEDTLS=no CXX_BUILTINMBEDTLS=no HAVE_OVERLAY=yes # Overlay support @@ -45,7 +45,7 @@ HAVE_NETWORKGAMEPAD=auto # Networked game pad (plus baked-in core) C89_NETWORKGAMEPAD=no HAVE_NETPLAYDISCOVERY=yes # Add netplay discovery (room creation, etc.) HAVE_MINIUPNPC=auto # Mini UPnP client library (for NAT traversal) -HAVE_BUILTINMINIUPNPC=yes # Bake in Mini UPnP client library (for NAT traversal) +HAVE_BUILTINMINIUPNPC=auto # Bake in Mini UPnP client library (for NAT traversal) C89_BUILTINMINIUPNPC=no HAVE_D3D8=no # Direct3D 8 support HAVE_D3D9=auto # Direct3D 9 support @@ -82,7 +82,7 @@ HAVE_EGL=auto # EGL context support HAVE_VG=auto # OpenVG support HAVE_CG=auto # Cg shader support HAVE_HLSL=no # HLSL9 shader support (for Direct3D9) -HAVE_BUILTINZLIB=yes # Bake in zlib +HAVE_BUILTINZLIB=auto # Bake in zlib HAVE_ZLIB=auto # zlib support (ZIP extract, PNG decoding/encoding) HAVE_ALSA=auto # ALSA support C89_ALSA=no @@ -114,7 +114,7 @@ HAVE_CHD=yes # Compile in chd support CXX_CHD=no HAVE_7ZIP=yes # Compile in 7z support HAVE_FLAC=auto # Compile in flac support -HAVE_BUILTINFLAC=yes # Bake in flac support +HAVE_BUILTINFLAC=auto # Bake in flac support HAVE_UPDATE_ASSETS=yes # Disable downloading assets with online updater HAVE_PRESERVE_DYLIB=no # Enable dlclose() for Valgrind support HAVE_PARPORT=auto # Parallel port joypad support