diff options
| author |  lat9nq | 2021-02-09 22:17:22 -0500 |
|---|---|---|
| committer | lat9nq | 2021-02-09 22:17:22 -0500 |
| commit | c44ab0f8f6dc1142e9190979be259a0d75149e9f (patch) | |
| tree | 3a2da61c9dc7295e99e70c7dc7e2000797bbfd45 /CMakeModules | |
| parent | Merge pull request #5901 from lioncash/input-warn (diff) | |
| download | yuzu-c44ab0f8f6dc1142e9190979be259a0d75149e9f.tar.gz yuzu-c44ab0f8f6dc1142e9190979be259a0d75149e9f.tar.xz yuzu-c44ab0f8f6dc1142e9190979be259a0d75149e9f.zip | |
cmake: Update FFmpeg to 4.3.1
Download FFmpeg package version 4.3.1. Uses a file defined within the
package to determine with DLLs to copy.
Also corrects a submodule name.
Diffstat (limited to 'CMakeModules')
| -rw-r--r-- | CMakeModules/CopyYuzuFFmpegDeps.cmake | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/CMakeModules/CopyYuzuFFmpegDeps.cmake b/CMakeModules/CopyYuzuFFmpegDeps.cmake index b7162cf17..26384e8b8 100644 --- a/CMakeModules/CopyYuzuFFmpegDeps.cmake +++ b/CMakeModules/CopyYuzuFFmpegDeps.cmake | |||
| @@ -1,10 +1,6 @@ | |||
| 1 | function(copy_yuzu_FFmpeg_deps target_dir) | 1 | function(copy_yuzu_FFmpeg_deps target_dir) |
| 2 | include(WindowsCopyFiles) | 2 | include(WindowsCopyFiles) |
| 3 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") | 3 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") |
| 4 | windows_copy_files(${target_dir} ${FFmpeg_DLL_DIR} ${DLL_DEST} | 4 | file(READ "${FFmpeg_PATH}/requirements.txt" FFmpeg_REQUIRED_DLLS) |
| 5 | avcodec-58.dll | 5 | windows_copy_files(${target_dir} ${FFmpeg_DLL_DIR} ${DLL_DEST} ${FFmpeg_REQUIRED_DLLS}) |
| 6 | avutil-56.dll | ||
| 7 | swresample-3.dll | ||
| 8 | swscale-5.dll | ||
| 9 | ) | ||
| 10 | endfunction(copy_yuzu_FFmpeg_deps) | 6 | endfunction(copy_yuzu_FFmpeg_deps) |