Browse Source

[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 <crueter@eden-emu.dev>
pull/2941/head
crueter 4 months ago
parent
commit
bbe7702983
No known key found for this signature in database GPG Key ID: 425ACD2D4830EBC6
  1. 7
      CMakeModules/CopyYuzuFFmpegDeps.cmake
  2. 8
      CMakeModules/CopyYuzuSDLDeps.cmake
  3. 6
      externals/ffmpeg/CMakeLists.txt
  4. 2
      src/yuzu/CMakeLists.txt

7
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 "$<TARGET_FILE_DIR:${target_dir}>/")
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)

8
CMakeModules/CopyYuzuSDLDeps.cmake

@ -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 "$<TARGET_FILE_DIR:${target_dir}>/")
windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll)
endfunction(copy_yuzu_SDL_deps)

6
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
)

2
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()

Loading…
Cancel
Save