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 | |
| 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.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | CMakeModules/CopyYuzuFFmpegDeps.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ac7c3ce90..c45123139 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -504,7 +504,7 @@ if (YUZU_USE_BUNDLED_FFMPEG) | |||
| 504 | endif() | 504 | endif() |
| 505 | else() # WIN32 | 505 | else() # WIN32 |
| 506 | # Use yuzu FFmpeg binaries | 506 | # Use yuzu FFmpeg binaries |
| 507 | set(FFmpeg_EXT_NAME "ffmpeg-4.3.1") | 507 | set(FFmpeg_EXT_NAME "ffmpeg-4.2.1") |
| 508 | set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}") | 508 | set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}") |
| 509 | download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") | 509 | download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") |
| 510 | set(FFmpeg_FOUND YES) | 510 | set(FFmpeg_FOUND YES) |
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 |