From bbe7702983f1b1abf6f1d92db8ec8e0c14a2fd36 Mon Sep 17 00:00:00 2001 From: crueter Date: Sun, 2 Nov 2025 21:01:49 -0500 Subject: [PATCH] [cmake] better FFmpeg debugging; remove obsolete CopyYuzuSDLDeps Ideally, we remove CopyYuzuFFmpegDeps and just use a static FFmpeg instead, unfortunately cubeb conflicts currently; something with ksuser? need to investigate further now that I actually understand Windows syslib fuckery Signed-off-by: crueter --- CMakeModules/CopyYuzuFFmpegDeps.cmake | 7 +++++++ CMakeModules/CopyYuzuSDLDeps.cmake | 8 -------- externals/ffmpeg/CMakeLists.txt | 6 +++--- src/yuzu/CMakeLists.txt | 2 -- 4 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 CMakeModules/CopyYuzuSDLDeps.cmake diff --git a/CMakeModules/CopyYuzuFFmpegDeps.cmake b/CMakeModules/CopyYuzuFFmpegDeps.cmake index e50696cc02..315d5eb6f4 100644 --- a/CMakeModules/CopyYuzuFFmpegDeps.cmake +++ b/CMakeModules/CopyYuzuFFmpegDeps.cmake @@ -1,10 +1,17 @@ +# SPDX-FileCopyrightText: 2025 Eden Emulator Project +# SPDX-License-Identifier: GPL-3.0-or-later + # SPDX-FileCopyrightText: 2020 yuzu Emulator Project # SPDX-License-Identifier: GPL-2.0-or-later +# TODO(crueter): Remove this entirely; notably, cubeb and ffmpeg conflict due to some weird ksuser stuff function(copy_yuzu_FFmpeg_deps target_dir) include(WindowsCopyFiles) set(DLL_DEST "$/") file(READ "${FFmpeg_PATH}/requirements.txt" FFmpeg_REQUIRED_DLLS) string(STRIP "${FFmpeg_REQUIRED_DLLS}" FFmpeg_REQUIRED_DLLS) + + message(STATUS "[CopyYuzuFFmpegDeps] Copying FFmpeg deps from ${FFmpeg_LIBRARY_DIR} to ${DLL_DEST}") + message(STATUS "[CopyYuzuFFmpegDeps] FFmpeg DLLs: ${FFmpeg_REQUIRED_DLLS}") windows_copy_files(${target_dir} ${FFmpeg_LIBRARY_DIR} ${DLL_DEST} ${FFmpeg_REQUIRED_DLLS}) endfunction(copy_yuzu_FFmpeg_deps) diff --git a/CMakeModules/CopyYuzuSDLDeps.cmake b/CMakeModules/CopyYuzuSDLDeps.cmake deleted file mode 100644 index 464eed5e9c..0000000000 --- a/CMakeModules/CopyYuzuSDLDeps.cmake +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-FileCopyrightText: 2016 Citra Emulator Project -# SPDX-License-Identifier: GPL-2.0-or-later - -function(copy_yuzu_SDL_deps target_dir) - include(WindowsCopyFiles) - set(DLL_DEST "$/") - windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll) -endfunction(copy_yuzu_SDL_deps) diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt index 59397f6acb..58c202288b 100644 --- a/externals/ffmpeg/CMakeLists.txt +++ b/externals/ffmpeg/CMakeLists.txt @@ -118,17 +118,17 @@ if (YUZU_USE_BUNDLED_FFMPEG) AddJsonPackage(ffmpeg-ci) set(FFmpeg_INCLUDE_DIR - "${FFmpeg_SOURCE_DIR}/include;${FFmpeg_HWACCEL_INCLUDE_DIRS}" + "${FFmpeg_INCLUDE_DIR};${FFmpeg_HWACCEL_INCLUDE_DIRS}" PARENT_SCOPE ) set(FFmpeg_PATH - "${FFmpeg_SOURCE_DIR}" + "${FFmpeg_PATH}" PARENT_SCOPE ) set(FFmpeg_LIBRARY_DIR - "${FFmpeg_SOURCE_DIR}/bin" + "${FFmpeg_LIBRARY_DIR}" PARENT_SCOPE ) diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index d6082dd00b..c10759d1c6 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -438,9 +438,7 @@ if (ENABLE_SDL2) endif() if (MSVC) - include(CopyYuzuSDLDeps) include(CopyYuzuFFmpegDeps) - copy_yuzu_SDL_deps(yuzu) copy_yuzu_FFmpeg_deps(yuzu) endif()