From 06dd8e52d96fad56a1cefb8b071e328dba527253 Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Wed, 5 Jan 2022 03:34:49 +0100 Subject: [PATCH] early-access version 2373 --- CMakeLists.txt | 2 ++ README.md | 2 +- externals/CMakeLists.txt | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d44d67562..707d514c3 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,6 +33,8 @@ option(ENABLE_CUBEB "Enables the cubeb audio backend" ON) option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF) +option(YUZU_USE_BUNDLED_OPUS "Compile bundled opus" ON) + # Default to a Release build get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) if (NOT IS_MULTI_CONFIG AND NOT CMAKE_BUILD_TYPE) diff --git a/README.md b/README.md index ce4bbe67e..985b353c0 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 2372. +This is the source code for early-access 2373. ## Legal Notice diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index e9095b123..158113516 100755 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -117,10 +117,10 @@ if (ENABLE_WEB_SERVICE) endif() # Opus -find_package(opus 1.3) -if (NOT opus_FOUND) - message(STATUS "opus 1.3 or newer not found, falling back to externals") +if (YUZU_USE_BUNDLED_OPUS) add_subdirectory(opus EXCLUDE_FROM_ALL) +else() + find_package(opus 1.3 REQUIRED) endif() # FFMpeg