Skip to content
Permalink
Browse files
Merge pull request #10530 from shuffle2/win-ffmpeg
windows: move ffmpeg bins to submodule
  • Loading branch information
AdmiralCurtiss committed Mar 31, 2022
2 parents cc3f820 + 4fad2c2 commit 4957b2e
Show file tree
Hide file tree
Showing 113 changed files with 79 additions and 26,086 deletions.
@@ -8,3 +8,8 @@
url = https://github.com/mgba-emu/mgba.git
branch = master
shallow = true
[submodule "Externals/FFmpeg-bin"]
path = Externals/FFmpeg-bin
url = https://github.com/dolphin-emu/ext-win-ffmpeg.git
branch = master
shallow = true
@@ -485,8 +485,12 @@ if(ENABLE_EGL)
endif()

if(ENCODE_FRAMEDUMPS)
if(WIN32 AND _M_X86_64)
set(FFMPEG_DIR Externals/ffmpeg)
if(WIN32)
if(_M_X86_64)
set(FFMPEG_DIR Externals/FFmpeg-bin/x64)
elseif(_M_ARM_64)
set(FFMPEG_DIR Externals/FFmpeg-bin/ARM64)
endif()
endif()
find_package(FFmpeg COMPONENTS avcodec avformat avutil swresample swscale)
if(FFmpeg_FOUND)
Submodule FFmpeg-bin added at 9bc087

0 comments on commit 4957b2e

Please sign in to comment.