diff options
| author |  Markus Wick | 2021-04-08 23:49:32 +0200 |
|---|---|---|
| committer | Markus Wick | 2021-04-08 23:49:32 +0200 |
| commit | 5096ed5e0ab91254a29a58234d1df71b4065745f (patch) | |
| tree | cd7ca8a690d42792f753a300c9ffcc0c9151629b /src | |
| parent | Merge pull request #6145 from lat9nq/nvhost_empty_memcpy (diff) | |
| download | yuzu-5096ed5e0ab91254a29a58234d1df71b4065745f.tar.gz yuzu-5096ed5e0ab91254a29a58234d1df71b4065745f.tar.xz yuzu-5096ed5e0ab91254a29a58234d1df71b4065745f.zip | |
externals: Search for shared opus installation.
We had used conan for opus before, but there was a bug in the AVX detection.
However we still had the Findopus.cmake file within the repository, but not used.
This patch reenables the Findopus helper and prefer the system wide installation of opus.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 17f251c37..e51a19e2d 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt | |||
| @@ -666,7 +666,7 @@ endif() | |||
| 666 | create_target_directory_groups(core) | 666 | create_target_directory_groups(core) |
| 667 | 667 | ||
| 668 | target_link_libraries(core PUBLIC common PRIVATE audio_core video_core) | 668 | target_link_libraries(core PUBLIC common PRIVATE audio_core video_core) |
| 669 | target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls opus zip) | 669 | target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls Opus::Opus zip) |
| 670 | 670 | ||
| 671 | if (YUZU_ENABLE_BOXCAT) | 671 | if (YUZU_ENABLE_BOXCAT) |
| 672 | target_compile_definitions(core PRIVATE -DYUZU_ENABLE_BOXCAT) | 672 | target_compile_definitions(core PRIVATE -DYUZU_ENABLE_BOXCAT) |