Merge pull request #10145 from NoNoTeal/master

Import Apple/FFmpeg libraries for AVI dumps on macOS
dolphin-emu · Oct 7, 2021 · d90b30c · d90b30c
2 parents bf6a278 + 90437d1
commit d90b30c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -488,8 +488,14 @@ if(ENCODE_FRAMEDUMPS)
   if(WIN32 AND _M_X86_64)
     set(FFMPEG_DIR Externals/ffmpeg)
   endif()
-  find_package(FFmpeg COMPONENTS avcodec avformat avutil swscale)
+  find_package(FFmpeg COMPONENTS avcodec avformat avutil swresample swscale)
   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")
     add_definitions(-DHAVE_FFMPEG)
   else()

diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt
@@ -167,6 +167,15 @@ if(FFmpeg_FOUND)
     FFmpeg::avcodec
     FFmpeg::avformat
     FFmpeg::avutil
+    FFmpeg::swresample
     FFmpeg::swscale
   )
+  if(APPLE) 
+    target_link_libraries(videocommon PRIVATE
+      ${COREMEDIA_LIBRARY}
+      ${VIDEOTOOLBOX_LIBRARY}
+      ${COREVIDEO_LIBRARY}
+      ${AUDIOTOOLBOX_LIBRARY}    
+    )
+  endif()
 endif()