@ -391,6 +391,10 @@ if (YUZU_USE_BUNDLED_FFMPEG)
# B u i l d F F m p e g f r o m e x t e r n a l s
# B u i l d F F m p e g f r o m e x t e r n a l s
message ( STATUS "Using FFmpeg from externals" )
message ( STATUS "Using FFmpeg from externals" )
# F F m p e g h a s s o u r c e t h a t r e q u i r e s o n e o f n a s m o r y a s m t o a s s e m b l e i t .
# R E Q U I R E D t h r o w s a n e r r o r i f n o t f o u n d h e r e d u r i n g c o n f i g u r a t i o n r a t h e r t h a n d u r i n g c o m p i l a t i o n .
find_program ( ASSEMBLER NAMES nasm yasm REQUIRED )
set ( FFmpeg_PREFIX ${ PROJECT_SOURCE_DIR } /externals/ffmpeg )
set ( FFmpeg_PREFIX ${ PROJECT_SOURCE_DIR } /externals/ffmpeg )
set ( FFmpeg_BUILD_DIR ${ PROJECT_BINARY_DIR } /externals/ffmpeg )
set ( FFmpeg_BUILD_DIR ${ PROJECT_BINARY_DIR } /externals/ffmpeg )
set ( FFmpeg_MAKEFILE ${ FFmpeg_BUILD_DIR } /Makefile )
set ( FFmpeg_MAKEFILE ${ FFmpeg_BUILD_DIR } /Makefile )
@ -448,11 +452,19 @@ if (YUZU_USE_BUNDLED_FFMPEG)
$ { F F m p e g _ B U I L D _ D I R }
$ { F F m p e g _ B U I L D _ D I R }
)
)
# W o r k a r o u n d f o r U b u n t u 1 8 . 0 4 ' s o l d e r v e r s i o n o f m a k e n o t b e i n g a b l e t o c a l l m a k e a s a c h i l d
# w i t h c o n t e x t o f t h e j o b s e r v e r . A l s o h e l p s n i n j a u s e r s .
execute_process (
C O M M A N D
n p r o c
O U T P U T _ V A R I A B L E
S Y S T E M _ T H R E A D S )
add_custom_command (
add_custom_command (
O U T P U T
O U T P U T
$ { F F m p e g _ L I B R A R I E S }
$ { F F m p e g _ L I B R A R I E S }
C O M M A N D
C O M M A N D
m a k e
m a k e - j $ { S Y S T E M _ T H R E A D S }
W O R K I N G _ D I R E C T O R Y
W O R K I N G _ D I R E C T O R Y
$ { F F m p e g _ B U I L D _ D I R }
$ { F F m p e g _ B U I L D _ D I R }
)
)