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
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
4 changed files with
10 additions and
13 deletions
CMakeModules/CopyYuzuFFmpegDeps.cmake
CMakeModules/CopyYuzuSDLDeps.cmake
externals/ffmpeg/CMakeLists.txt
src/yuzu/CMakeLists.txt
@ -1,10 +1,17 @@
# S P D X - F i l e C o p y r i g h t T e x t : 2 0 2 5 E d e n E m u l a t o r P r o j e c t
# S P D X - L i c e n s e - I d e n t i f i e r : G P L - 3 . 0 - o r - l a t e r
# S P D X - F i l e C o p y r i g h t T e x t : 2 0 2 0 y u z u E m u l a t o r P r o j e c t
# S P D X - L i c e n s e - I d e n t i f i e r : G P L - 2 . 0 - o r - l a t e r
# TODO ( crueter ) : R e m o v e t h i s e n t i r e l y ; n o t a b l y , c u b e b a n d f f m p e g c o n f l i c t d u e t o s o m e w e i r d k s u s e r s t u f f
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 )
@ -1,8 +0,0 @@
# S P D X - F i l e C o p y r i g h t T e x t : 2 0 1 6 C i t r a E m u l a t o r P r o j e c t
# S P D X - L i c e n s e - I d e n t i f i e r : G P L - 2 . 0 - o r - l a t e r
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 )
@ -118,17 +118,17 @@ if (YUZU_USE_BUNDLED_FFMPEG)
AddJsonPackage ( ffmpeg-ci )
set ( FFmpeg_INCLUDE_DIR
" $ { F F m p e g _ S O U R C E _ D I R } / i n c l u d e ; $ { F F m p e g _ H W A C C E L _ I N C L U D E _ D I R S } "
" $ { F F m p e g _ I N C L U D E _ D I R } ; $ { F F m p e g _ H W A C C E L _ I N C L U D E _ D I R S } "
P A R E N T _ S C O P E
)
set ( FFmpeg_PATH
" $ { F F m p e g _ S O U R C E _ D I R } "
" $ { F F m p e g _ P A T H } "
P A R E N T _ S C O P E
)
set ( FFmpeg_LIBRARY_DIR
" $ { F F m p e g _ S O U R C E _ D I R } / b i n "
" $ { F F m p e g _ L I B R A R Y _ D I R } "
P A R E N T _ S C O P E
)
@ -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 ( )