Use precompiled ffmpeg

Signed-off-by: Isaac Marovitz <isaacryu@icloud.com>

Author: IsaacMarovitz

.gitmodules

@@ -43,9 +43,6 @@
 [submodule "thirdparty/json"]
 	path = thirdparty/json
 	url = https://github.com/nlohmann/json
-[submodule "thirdparty/FFmpeg"]
-	path = thirdparty/FFmpeg
-	url = https://github.com/IsaacMarovitz/FFmpeg
 [submodule "MarathonRecompResources"]
 	path = MarathonRecompResources
 	url = https://github.com/IsaacMarovitz/MarathonRecompResources
@@ -58,3 +55,6 @@
 [submodule "thirdparty/plume"]
 	path = thirdparty/plume
 	url = https://github.com/renderbag/plume
+[submodule "thirdparty/ffmpeg-core"]
+	path = thirdparty/ffmpeg-core
+	url = https://github.com/IsaacMarovitz/ffmpeg-core

MarathonRecomp/CMakeLists.txt

@@ -139,8 +139,8 @@ set(MARATHON_RECOMP_PATCHES_CXX_SOURCES
     "patches/audio_patches.cpp"
     "patches/camera_patches.cpp"
     "patches/frontend_listener.cpp"
-    "patches/misc_patches.cpp"
-    "patches/TitleTask_patches.cpp"
+    "patches/misc_patches.cpp"
+    "patches/TitleTask_patches.cpp"
     "patches/video_patches.cpp"
 )
 
@@ -419,12 +419,7 @@ target_link_libraries(MarathonRecomp PRIVATE
     plume
 )
 
-if (NOT WIN32)
-    target_link_libraries(MarathonRecomp PRIVATE
-        ffmpeg::avcodec
-        ffmpeg::avutil
-    )
-endif()
+target_link_libraries(MarathonRecomp PRIVATE ffmpeg)
 
 target_include_directories(MarathonRecomp PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}

thirdparty/CMakeLists.txt

@@ -15,54 +15,31 @@ set(SDL2MIXER_OPUS OFF)
 set(SDL2MIXER_VORBIS "VORBISFILE")
 set(SDL2MIXER_WAVPACK OFF)
 
+if (APPLE AND CMAKE_OSX_ARCHITECTURES)
+    set(BASE_ARCHITECTURE "${CMAKE_OSX_ARCHITECTURES}")
+elseif (CMAKE_SYSTEM_PROCESSOR)
+    set(BASE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}")
+else()
+    set(BASE_ARCHITECTURE "${CMAKE_HOST_SYSTEM_PROCESSOR}")
+endif()
+
+# Next, match common architecture strings down to a known common value.
+if (BASE_ARCHITECTURE MATCHES "(x86)|(X86)|(amd64)|(AMD64)")
+    set(ARCHITECTURE "x86_64")
+elseif (BASE_ARCHITECTURE MATCHES "(aarch64)|(AARCH64)|(arm64)|(ARM64)")
+    set(ARCHITECTURE "arm64")
+else()
+    message(FATAL_ERROR "Unsupported CPU architecture: ${BASE_ARCHITECTURE}")
+endif()
+
 add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/msdf-atlas-gen")
 add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/nativefiledialog-extended")
 add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/o1heap")
 add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/SDL")
 add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/SDL_mixer")
 add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/plume")
+add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/ffmpeg-core")
 
 if (APPLE)
     add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/MoltenVK")
 endif()
-
-if (NOT WIN32)
-    set(FFMPEG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/FFmpeg)
-
-    add_custom_command(
-            OUTPUT ${FFMPEG_PATH}/config.h
-            COMMAND ./configure --disable-all --disable-x86asm --disable-autodetect --disable-network --enable-avcodec --enable-decoder='xmaframes'
-            COMMENT "Configuring FFmpeg..."
-            WORKING_DIRECTORY ${FFMPEG_PATH}
-    )
-
-    add_custom_target(ffmpeg-configure DEPENDS ${FFMPEG_PATH}/config.h)
-
-    function(import_ffmpeg_library name)
-        if (${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
-            set(MAKE_COMMAND $(MAKE) -j$(nproc))
-        elseif (${CMAKE_GENERATOR} STREQUAL "Ninja")
-            set(MAKE_COMMAND make -j$$(nproc))
-        else()
-            set(MAKE_COMMAND make)
-        endif()
-
-        add_custom_command(
-            OUTPUT "${FFMPEG_PATH}/lib${name}/lib${name}.a"
-            COMMAND ${MAKE_COMMAND} -C ${FFMPEG_PATH} "lib${name}/lib${name}.a"
-            COMMENT "Building lib${name}/lib${name}.a"
-            DEPENDS ffmpeg-configure
-            WORKING_DIRECTORY ${FFMPEG_PATH}
-        )
-
-        add_custom_target(ffmpeg-build-${name} DEPENDS "${FFMPEG_PATH}/lib${name}/lib${name}.a")
-
-        add_library(ffmpeg::${name} STATIC IMPORTED GLOBAL)
-        set_property(TARGET ffmpeg::${name} PROPERTY IMPORTED_LOCATION "${FFMPEG_PATH}/lib${name}/lib${name}.a")
-        set_property(TARGET ffmpeg::${name} PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${FFMPEG_PATH}")
-        add_dependencies(ffmpeg::${name} ffmpeg-build-${name})
-    endfunction()
-
-    import_ffmpeg_library(avcodec)
-    import_ffmpeg_library(avutil)
-endif()