Makefile.common: Remove redundant conditionals.

C89 builds are only used for the qb build system currently and these are
already checked in qb/config.params.sh.

Additionally the HAVE_NETWORKING check is handled with qb/config.lib.sh
where HAVE_SSL and HAVE_BUILTINMBEDTLS are disabled if networking is
also disabled. The other build systems should never define HAVE_SSL or
HAVE_BUILTINMBEDTLS without HAVE_NETWORKING. Also there are no other
build systems that rely on Makefile.common using this yet.
This commit is contained in:
orbea 2018-12-19 16:05:40 -08:00
parent d41bb64d17
commit 066bbd1a29
2 changed files with 92 additions and 97 deletions

View File

@ -393,8 +393,6 @@ ifeq ($(HAVE_LIBRETRODB), 1)
tasks/task_database_cue.o
endif
ifneq ($(C89_BUILD), 1)
ifeq ($(HAVE_NETWORKING), 1)
ifeq ($(HAVE_BUILTINMBEDTLS), 1)
HAVE_SSL = 1
DEFINES += -DHAVE_SSL
@ -485,8 +483,6 @@ ifneq ($(C89_BUILD), 1)
DEFINES += -DHAVE_SSL
LIBS += $(MBEDTLS_LIBS) $(MBEDX509_LIBS) $(MBEDCRYPTO_LIBS)
endif
endif
endif
# Miscellaneous
@ -1090,13 +1086,11 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
endif
ifeq ($(HAVE_FFMPEG), 1)
ifneq ($(C89_BUILD), 1)
ifneq ($(HAVE_OPENGLES), 1)
OBJ += cores/libretro-ffmpeg/ffmpeg_fft.o
DEFINES += -I$(DEPS_DIR) -DHAVE_GL_FFT
endif
endif
endif
ifeq ($(HAVE_METAL), 1)
DEFINES += -DHAVE_METAL

View File

@ -18,6 +18,7 @@ HAVE_RUNAHEAD=yes # Runahead support
HAVE_SSL=auto # SSL/mbedtls support
C89_SSL=no
HAVE_BUILTINMBEDTLS=yes # Bake in the mbedtls library
C89_BUILTINMBEDTLS=no
HAVE_OVERLAY=yes # Overlay support
HAVE_DYNAMIC=yes # Dynamic loading of libretro library
HAVE_SDL=auto # SDL support
@ -32,8 +33,8 @@ HAVE_UDEV=auto # Udev/Evdev gamepad support
HAVE_THREADS=auto # Threading support
HAVE_THREAD_STORAGE=auto # Thread Local Storage support
HAVE_FFMPEG=auto # FFmpeg support
HAVE_MPV=auto # MPV support
C89_FFMPEG=no
HAVE_MPV=auto # MPV support
HAVE_SSA=auto # SSA/ASS for FFmpeg subtitle support
HAVE_DYLIB=auto # Dynamic loading support
HAVE_NETWORKING=auto # Networking features (recommended)