yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Merge pull request #7610 from Tatsh/more-system-libs 

Add support for linking against system Opus
This commit is contained in:
bunnei 2022-01-04 17:32:35 -08:00 committed by GitHub
parent afb06b1495 78759d98dc
commit 6af82fd070
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -33,6 +33,8 @@ option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)
option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF) option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
option(YUZU_USE_BUNDLED_OPUS "Compile bundled opus" ON)
# Default to a Release build # Default to a Release build
get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
if (NOT IS_MULTI_CONFIG AND NOT CMAKE_BUILD_TYPE) if (NOT IS_MULTI_CONFIG AND NOT CMAKE_BUILD_TYPE)

6
externals/CMakeLists.txt vendored
View File

@ -117,10 +117,10 @@ if (ENABLE_WEB_SERVICE)
endif() endif()
# Opus # Opus
find_package(opus 1.3) if (YUZU_USE_BUNDLED_OPUS)
if (NOT opus_FOUND)
message(STATUS "opus 1.3 or newer not found, falling back to externals")
add_subdirectory(opus EXCLUDE_FROM_ALL) add_subdirectory(opus EXCLUDE_FROM_ALL)
else()
find_package(opus 1.3 REQUIRED)
endif() endif()
# FFMpeg # FFMpeg