diff options
| author | Andrew Udvare <audvare@gmail.com> | 2021-12-21 01:20:26 +0100 |
|---|---|---|
| committer | Andrew Udvare <audvare@gmail.com> | 2021-12-21 11:05:23 +0100 |
| commit | 78759d98dc6cf20d770e0aadc87efdc500de4359 (patch) | |
| tree | 48134ef0dd91e9d41ecd2a354b9ee461b067d22b | |
| parent | Merge pull request #7532 from goldenx86/patch-3 (diff) | |
| download | yuzu-78759d98dc6cf20d770e0aadc87efdc500de4359.tar yuzu-78759d98dc6cf20d770e0aadc87efdc500de4359.tar.gz yuzu-78759d98dc6cf20d770e0aadc87efdc500de4359.tar.bz2 yuzu-78759d98dc6cf20d770e0aadc87efdc500de4359.tar.lz yuzu-78759d98dc6cf20d770e0aadc87efdc500de4359.tar.xz yuzu-78759d98dc6cf20d770e0aadc87efdc500de4359.tar.zst yuzu-78759d98dc6cf20d770e0aadc87efdc500de4359.zip | |
| -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 a810e11c2..1a7b1d85a 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 64d1e6aec..26ead64f2 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -116,8 +116,8 @@ 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() |