ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10145 from NoNoTeal/master 

Import Apple/FFmpeg libraries for AVI dumps on macOS
This commit is contained in:
Léo Lam 2021-10-07 08:18:53 +02:00 committed by GitHub
parent bf6a278c04 90437d1574
commit d90b30ca25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -488,8 +488,14 @@ if(ENCODE_FRAMEDUMPS)
if(WIN32 AND _M_X86_64) if(WIN32 AND _M_X86_64)
set(FFMPEG_DIR Externals/ffmpeg) set(FFMPEG_DIR Externals/ffmpeg)
endif() endif()
find_package(FFmpeg COMPONENTS avcodec avformat avutil swscale) find_package(FFmpeg COMPONENTS avcodec avformat avutil swresample swscale)
if(FFmpeg_FOUND) if(FFmpeg_FOUND)
if(APPLE)
find_library(COREMEDIA_LIBRARY CoreMedia)
find_library(VIDEOTOOLBOX_LIBRARY VideoToolbox)
find_library(COREVIDEO_LIBRARY CoreVideo)
find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
endif()
message(STATUS "libav/ffmpeg found, enabling AVI frame dumps") message(STATUS "libav/ffmpeg found, enabling AVI frame dumps")
add_definitions(-DHAVE_FFMPEG) add_definitions(-DHAVE_FFMPEG)
else() else()

9
Source/Core/VideoCommon/CMakeLists.txt
View File

@ -167,6 +167,15 @@ if(FFmpeg_FOUND)
FFmpeg::avcodec FFmpeg::avcodec
FFmpeg::avformat FFmpeg::avformat
FFmpeg::avutil FFmpeg::avutil
FFmpeg::swresample
FFmpeg::swscale FFmpeg::swscale
) )
if(APPLE)
target_link_libraries(videocommon PRIVATE
${COREMEDIA_LIBRARY}
${VIDEOTOOLBOX_LIBRARY}
${COREVIDEO_LIBRARY}
${AUDIOTOOLBOX_LIBRARY}
)
endif()
endif() endif()