summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--externals/CMakeLists.txt6
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)
33 33
34option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF) 34option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
35 35
36option(YUZU_USE_BUNDLED_OPUS "Compile bundled opus" ON)
37
36# Default to a Release build 38# Default to a Release build
37get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) 39get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
38if (NOT IS_MULTI_CONFIG AND NOT CMAKE_BUILD_TYPE) 40if (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)
117endif() 117endif()
118 118
119# Opus 119# Opus
120find_package(opus 1.3) 120if (YUZU_USE_BUNDLED_OPUS)
121if (NOT opus_FOUND)
122 message(STATUS "opus 1.3 or newer not found, falling back to externals")
123 add_subdirectory(opus EXCLUDE_FROM_ALL) 121 add_subdirectory(opus EXCLUDE_FROM_ALL)
122else()
123 find_package(opus 1.3 REQUIRED)
124endif() 124endif()
125 125
126# FFMpeg 126# FFMpeg