@ -19,7 +19,7 @@ CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" ON "EN
option ( ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON )
option ( ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON )
CMAKE_DEPENDENT_OPTION ( YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled yuzu " ON "WIN32" OFF )
CMAKE_DEPENDENT_OPTION ( YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg " ON "WIN32" OFF )
option ( YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF )
option ( YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF )
@ -394,7 +394,7 @@ set(FFmpeg_COMPONENTS
if ( NOT YUZU_USE_BUNDLED_FFMPEG )
if ( NOT YUZU_USE_BUNDLED_FFMPEG )
# U s e s y s t e m i n s t a l l e d F F m p e g
# U s e s y s t e m i n s t a l l e d F F m p e g
find_package ( FFmpeg REQUIRED COMPONENTS ${ FFmpeg_COMPONENTS } )
find_package ( FFmpeg QUIET COMPONENTS ${ FFmpeg_COMPONENTS } )
if ( FFmpeg_FOUND )
if ( FFmpeg_FOUND )
# O v e r w r i t e a g g r e g a t e d e f i n e s f r o m F F m p e g m o d u l e t o a v o i d o v e r - l i n k i n g l i b r a r i e s .
# O v e r w r i t e a g g r e g a t e d e f i n e s f r o m F F m p e g m o d u l e t o a v o i d o v e r - l i n k i n g l i b r a r i e s .
@ -433,6 +433,7 @@ if (YUZU_USE_BUNDLED_FFMPEG)
set ( FFmpeg_FOUND YES )
set ( FFmpeg_FOUND YES )
endif ( )
endif ( )
unset ( FFmpeg_LIBRARIES CACHE )
foreach ( COMPONENT ${ FFmpeg_COMPONENTS } )
foreach ( COMPONENT ${ FFmpeg_COMPONENTS } )
set ( FFmpeg_ ${ COMPONENT } _PREFIX "${FFmpeg_BUILD_DIR}/lib${COMPONENT}" )
set ( FFmpeg_ ${ COMPONENT } _PREFIX "${FFmpeg_BUILD_DIR}/lib${COMPONENT}" )
set ( FFmpeg_ ${ COMPONENT } _LIB_NAME "lib${COMPONENT}.a" )
set ( FFmpeg_ ${ COMPONENT } _LIB_NAME "lib${COMPONENT}.a" )
@ -445,7 +446,7 @@ if (YUZU_USE_BUNDLED_FFMPEG)
endforeach ( )
endforeach ( )
set ( FFmpeg_INCLUDE_DIR
set ( FFmpeg_INCLUDE_DIR
${ F F m p e g _ P R E F I X }
" ${ F F m p e g _ P R E F I X } ; $ { F F m p e g _ B U I L D _ D I R } "
C A C H E P A T H " P a t h t o F F m p e g h e a d e r s " F O R C E )
C A C H E P A T H " P a t h t o F F m p e g h e a d e r s " F O R C E )
# ` c o n f i g u r e ` p a r a m e t e r s b u i l d s o n l y e x a c t l y w h a t y u z u n e e d s f r o m F F m p e g
# ` c o n f i g u r e ` p a r a m e t e r s b u i l d s o n l y e x a c t l y w h a t y u z u n e e d s f r o m F F m p e g
@ -492,13 +493,11 @@ if (YUZU_USE_BUNDLED_FFMPEG)
# A L L m a k e s t h i s c u s t o m t a r g e t b u i l d e v e r y t i m e
# A L L m a k e s t h i s c u s t o m t a r g e t b u i l d e v e r y t i m e
# b u t i t w o n ' t a c t u a l l y b u i l d i f t h e D E P E N D S p a r a m e t e r i s u p t o d a t e
# b u t i t w o n ' t a c t u a l l y b u i l d i f t h e D E P E N D S p a r a m e t e r i s u p t o d a t e
add_custom_target ( ffmpeg-build ALL DEPENDS ${ FFmpeg_LIBRARIES } )
add_custom_target ( ffmpeg-configure ALL DEPENDS ${ FFmpeg_MAKEFILE } )
add_custom_target ( ffmpeg-configure ALL DEPENDS ${ FFmpeg_MAKEFILE } )
add_custom_target ( ffmpeg-build ALL DEPENDS ${ FFmpeg_LIBRARIES } ffmpeg-configure )
if ( FFmpeg_FOUND )
if ( FFmpeg_FOUND )
message ( STATUS "Found FFmpeg version ${FFmpeg_VERSION}" )
message ( STATUS "Found FFmpeg version ${FFmpeg_VERSION}" )
add_dependencies ( ffmpeg-build ffmpeg-configure )
else ( )
else ( )
message ( FATAL_ERROR "FFmpeg not found" )
message ( FATAL_ERROR "FFmpeg not found" )
endif ( )
endif ( )