Merge pull request #7610 from Tatsh/more-system-libs
Add support for linking against system Opus
This commit is contained in:
		| @@ -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) | ||||
|   | ||||
							
								
								
									
										6
									
								
								externals/CMakeLists.txt
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								externals/CMakeLists.txt
									
									
									
									
										vendored
									
									
								
							| @@ -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 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user