summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar lat9nq2021-02-05 15:39:19 -0500
committerGravatar lat9nq2021-02-05 15:39:19 -0500
commit1d19eac415199bd4c768f1cbebc9f23298734545 (patch)
tree44fde361562f37ab713e4332d883a73b819f4c26 /src
parentci/windows: Copy downloaded FFmpeg libraries (diff)
downloadyuzu-1d19eac415199bd4c768f1cbebc9f23298734545.tar.gz
yuzu-1d19eac415199bd4c768f1cbebc9f23298734545.tar.xz
yuzu-1d19eac415199bd4c768f1cbebc9f23298734545.zip
CMake: Port citra-emu/citra FindFFmpeg.cmake
Also renames related CMake variables to match both the Find*FFmpeg* and variables defined within the file. Fixes odd errors produced by the old FindFFmpeg. Citra's FindFFmpeg is slightly modified here: adds Citra's copyright at the beginning, renames FFmpeg_INCLUDES to FFmpeg_INCLUDE_DIR, disables a few components in _FFmpeg_ALL_COMPONENTS, and adds the missing avutil component to the comment above.
Diffstat (limited to 'src')
-rw-r--r--src/video_core/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
index 01e284d8c..1434d0260 100644
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@@ -277,8 +277,8 @@ if (YUZU_USE_BUNDLED_FFMPEG AND NOT WIN32)
277 add_dependencies(video_core ffmpeg-build) 277 add_dependencies(video_core ffmpeg-build)
278endif() 278endif()
279 279
280target_include_directories(video_core PRIVATE ${FFMPEG_INCLUDE_DIR}) 280target_include_directories(video_core PRIVATE ${FFmpeg_INCLUDE_DIR})
281target_link_libraries(video_core PRIVATE ${FFMPEG_LIBRARIES}) 281target_link_libraries(video_core PRIVATE ${FFmpeg_LIBRARIES})
282 282
283add_dependencies(video_core host_shaders) 283add_dependencies(video_core host_shaders)
284target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE}) 284target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE})