diff options
| author | bunnei <[email protected]> | 2022-01-04 17:32:35 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-01-04 17:32:35 -0800 |
| commit | 6af82fd070790e5c6da944f9b07f3b8ca8156985 (patch) | |
| tree | 8b7d501ae993d38167524021f306edf7aa467f39 | |
| parent | afb06b149505b21af976d3d1e24186b8260ee018 (diff) | |
| parent | 78759d98dc6cf20d770e0aadc87efdc500de4359 (diff) | |
| download | yuzu-android-6af82fd070790e5c6da944f9b07f3b8ca8156985.tar.gz yuzu-android-6af82fd070790e5c6da944f9b07f3b8ca8156985.zip | |
Merge pull request #7610 from Tatsh/more-system-libs
Add support for linking against system Opus
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | externals/CMakeLists.txt | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d44d67562..707d514c3 100644 --- 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/externals/CMakeLists.txt b/externals/CMakeLists.txt index e9095b123..158113516 100644 --- 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 |