diff --git a/Makefile.common b/Makefile.common index d504420eb8..573f866cc7 100644 --- a/Makefile.common +++ b/Makefile.common @@ -393,99 +393,95 @@ 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 +ifeq ($(HAVE_BUILTINMBEDTLS), 1) + HAVE_SSL = 1 + DEFINES += -DHAVE_SSL - ifeq ($(DEBUG), 1) - DEFINES += -DMBEDTLS_SSL_DEBUG_ALL - endif - - # MinGW requires this for some reason, even though the include paths are relative to the source - INCLUDE_DIRS += -Ideps/mbedtls - - OBJS_TLS_CRYPTO = deps/mbedtls/aes.o \ - deps/mbedtls/aesni.o \ - deps/mbedtls/arc4.o \ - deps/mbedtls/asn1parse.o \ - deps/mbedtls/asn1write.o \ - deps/mbedtls/base64.o \ - deps/mbedtls/bignum.o \ - deps/mbedtls/blowfish.o \ - deps/mbedtls/camellia.o \ - deps/mbedtls/ccm.o \ - deps/mbedtls/cipher.o \ - deps/mbedtls/cipher_wrap.o \ - deps/mbedtls/cmac.o \ - deps/mbedtls/ctr_drbg.o \ - deps/mbedtls/des.o \ - deps/mbedtls/dhm.o \ - deps/mbedtls/ecdh.o \ - deps/mbedtls/ecdsa.o \ - deps/mbedtls/ecjpake.o \ - deps/mbedtls/ecp.o \ - deps/mbedtls/ecp_curves.o \ - deps/mbedtls/entropy.o \ - deps/mbedtls/entropy_poll.o \ - deps/mbedtls/error.o \ - deps/mbedtls/gcm.o \ - deps/mbedtls/havege.o \ - deps/mbedtls/hmac_drbg.o \ - deps/mbedtls/md.o \ - deps/mbedtls/md2.o \ - deps/mbedtls/md4.o \ - deps/mbedtls/md5.o \ - deps/mbedtls/md_wrap.o \ - deps/mbedtls/memory_buffer_alloc.o \ - deps/mbedtls/oid.o \ - deps/mbedtls/padlock.o \ - deps/mbedtls/pem.o \ - deps/mbedtls/pk.o \ - deps/mbedtls/pk_wrap.o \ - deps/mbedtls/pkcs12.o \ - deps/mbedtls/pkcs5.o \ - deps/mbedtls/pkparse.o \ - deps/mbedtls/pkwrite.o \ - deps/mbedtls/platform.o \ - deps/mbedtls/ripemd160.o \ - deps/mbedtls/rsa.o \ - deps/mbedtls/sha1.o \ - deps/mbedtls/sha256.o \ - deps/mbedtls/sha512.o \ - deps/mbedtls/threading.o \ - deps/mbedtls/timing.o \ - deps/mbedtls/version.o \ - deps/mbedtls/version_features.o \ - deps/mbedtls/xtea.o - - OBJS_TLS_X509 = deps/mbedtls/certs.o \ - deps/mbedtls/pkcs11.o \ - deps/mbedtls/x509.o \ - deps/mbedtls/x509_create.o \ - deps/mbedtls/x509_crl.o \ - deps/mbedtls/x509_crt.o \ - deps/mbedtls/x509_csr.o \ - deps/mbedtls/x509write_crt.o \ - deps/mbedtls/x509write_csr.o - - OBJS_TLS = deps/mbedtls/debug.o \ - deps/mbedtls/net_sockets.o \ - deps/mbedtls/ssl_cache.o \ - deps/mbedtls/ssl_ciphersuites.o \ - deps/mbedtls/ssl_cli.o \ - deps/mbedtls/ssl_cookie.o \ - deps/mbedtls/ssl_srv.o \ - deps/mbedtls/ssl_ticket.o \ - deps/mbedtls/ssl_tls.o - - OBJ += $(OBJS_TLS_CRYPTO) $(OBJS_TLS_X509) $(OBJS_TLS) - else ifeq ($(HAVE_SSL), 1) - DEFINES += -DHAVE_SSL - LIBS += $(MBEDTLS_LIBS) $(MBEDX509_LIBS) $(MBEDCRYPTO_LIBS) - endif + ifeq ($(DEBUG), 1) + DEFINES += -DMBEDTLS_SSL_DEBUG_ALL endif + + # MinGW requires this for some reason, even though the include paths are relative to the source + INCLUDE_DIRS += -Ideps/mbedtls + + OBJS_TLS_CRYPTO = deps/mbedtls/aes.o \ + deps/mbedtls/aesni.o \ + deps/mbedtls/arc4.o \ + deps/mbedtls/asn1parse.o \ + deps/mbedtls/asn1write.o \ + deps/mbedtls/base64.o \ + deps/mbedtls/bignum.o \ + deps/mbedtls/blowfish.o \ + deps/mbedtls/camellia.o \ + deps/mbedtls/ccm.o \ + deps/mbedtls/cipher.o \ + deps/mbedtls/cipher_wrap.o \ + deps/mbedtls/cmac.o \ + deps/mbedtls/ctr_drbg.o \ + deps/mbedtls/des.o \ + deps/mbedtls/dhm.o \ + deps/mbedtls/ecdh.o \ + deps/mbedtls/ecdsa.o \ + deps/mbedtls/ecjpake.o \ + deps/mbedtls/ecp.o \ + deps/mbedtls/ecp_curves.o \ + deps/mbedtls/entropy.o \ + deps/mbedtls/entropy_poll.o \ + deps/mbedtls/error.o \ + deps/mbedtls/gcm.o \ + deps/mbedtls/havege.o \ + deps/mbedtls/hmac_drbg.o \ + deps/mbedtls/md.o \ + deps/mbedtls/md2.o \ + deps/mbedtls/md4.o \ + deps/mbedtls/md5.o \ + deps/mbedtls/md_wrap.o \ + deps/mbedtls/memory_buffer_alloc.o \ + deps/mbedtls/oid.o \ + deps/mbedtls/padlock.o \ + deps/mbedtls/pem.o \ + deps/mbedtls/pk.o \ + deps/mbedtls/pk_wrap.o \ + deps/mbedtls/pkcs12.o \ + deps/mbedtls/pkcs5.o \ + deps/mbedtls/pkparse.o \ + deps/mbedtls/pkwrite.o \ + deps/mbedtls/platform.o \ + deps/mbedtls/ripemd160.o \ + deps/mbedtls/rsa.o \ + deps/mbedtls/sha1.o \ + deps/mbedtls/sha256.o \ + deps/mbedtls/sha512.o \ + deps/mbedtls/threading.o \ + deps/mbedtls/timing.o \ + deps/mbedtls/version.o \ + deps/mbedtls/version_features.o \ + deps/mbedtls/xtea.o + + OBJS_TLS_X509 = deps/mbedtls/certs.o \ + deps/mbedtls/pkcs11.o \ + deps/mbedtls/x509.o \ + deps/mbedtls/x509_create.o \ + deps/mbedtls/x509_crl.o \ + deps/mbedtls/x509_crt.o \ + deps/mbedtls/x509_csr.o \ + deps/mbedtls/x509write_crt.o \ + deps/mbedtls/x509write_csr.o + + OBJS_TLS = deps/mbedtls/debug.o \ + deps/mbedtls/net_sockets.o \ + deps/mbedtls/ssl_cache.o \ + deps/mbedtls/ssl_ciphersuites.o \ + deps/mbedtls/ssl_cli.o \ + deps/mbedtls/ssl_cookie.o \ + deps/mbedtls/ssl_srv.o \ + deps/mbedtls/ssl_ticket.o \ + deps/mbedtls/ssl_tls.o + + OBJ += $(OBJS_TLS_CRYPTO) $(OBJS_TLS_X509) $(OBJS_TLS) +else ifeq ($(HAVE_SSL), 1) + DEFINES += -DHAVE_SSL + LIBS += $(MBEDTLS_LIBS) $(MBEDX509_LIBS) $(MBEDCRYPTO_LIBS) endif # Miscellaneous @@ -1090,11 +1086,9 @@ 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 + ifneq ($(HAVE_OPENGLES), 1) + OBJ += cores/libretro-ffmpeg/ffmpeg_fft.o + DEFINES += -I$(DEPS_DIR) -DHAVE_GL_FFT endif endif diff --git a/qb/config.params.sh b/qb/config.params.sh index 545af55b73..feb4f262c8 100644 --- a/qb/config.params.sh +++ b/qb/config.params.sh @@ -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)