diff options
| author |  ameerj | 2021-02-08 23:11:59 -0500 |
|---|---|---|
| committer | ameerj | 2021-02-08 23:11:59 -0500 |
| commit | d6ebb5c1719c68002f8756de7e00c152c55948d8 (patch) | |
| tree | c4cc15a15a62279799f9e4c1fc43b50fbf993359 /CMakeModules | |
| parent | Merge pull request #5880 from lat9nq/ffmpeg-external (diff) | |
| download | yuzu-d6ebb5c1719c68002f8756de7e00c152c55948d8.tar.gz yuzu-d6ebb5c1719c68002f8756de7e00c152c55948d8.tar.xz yuzu-d6ebb5c1719c68002f8756de7e00c152c55948d8.zip | |
cmake: Revert FFmpeg 4.3.1 update for Windows builds
The new 4.3.1 externals build seems to not be compatible with yuzu. This also fixes an oversight when renaming CMake variables.
Diffstat (limited to 'CMakeModules')
| -rw-r--r-- | CMakeModules/CopyYuzuFFmpegDeps.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeModules/CopyYuzuFFmpegDeps.cmake b/CMakeModules/CopyYuzuFFmpegDeps.cmake index cca1eeeab..b7162cf17 100644 --- a/CMakeModules/CopyYuzuFFmpegDeps.cmake +++ b/CMakeModules/CopyYuzuFFmpegDeps.cmake | |||
| @@ -1,7 +1,7 @@ | |||
| 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 | windows_copy_files(${target_dir} ${FFmpeg_DLL_DIR} ${DLL_DEST} |
| 5 | avcodec-58.dll | 5 | avcodec-58.dll |
| 6 | avutil-56.dll | 6 | avutil-56.dll |
| 7 | swresample-3.dll | 7 | swresample-3.dll |