actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Enable asm optimizations for ffmpeg on macOS

Browse Source
This commit is contained in:
Martin Natano
2022-06-05 12:04:37 +02:00
parent 3eb239ad3b
commit ed4090e2ba
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMake/SetupFfmpeg.cmake
-1
View File
@@ -33,7 +33,6 @@ if(CMAKE_POSITION_INDEPENDENT_CODE)
endif() endif()
if(MACOSX) if(MACOSX)
list(APPEND FFMPEG_CONFIGURE "--disable-asm")
list(APPEND FFMPEG_CONFIGURE "--enable-cross-compile") list(APPEND FFMPEG_CONFIGURE "--enable-cross-compile")
list(APPEND FFMPEG_CONFIGURE "--enable-videotoolbox") list(APPEND FFMPEG_CONFIGURE "--enable-videotoolbox")
list(APPEND FFMPEG_CONFIGURE "--extra-cflags=-mmacosx-version-min=11") list(APPEND FFMPEG_CONFIGURE "--extra-cflags=-mmacosx-version-min=11")
StepmaniaCore.cmake
+7 -1
View File
@@ -299,6 +299,12 @@ elseif(MACOSX)
find_library(MAC_FRAME_COREMEDIA CoreMedia ${CMAKE_SYSTEM_FRAMEWORK_PATH} REQUIRED) find_library(MAC_FRAME_COREMEDIA CoreMedia ${CMAKE_SYSTEM_FRAMEWORK_PATH} REQUIRED)
find_library(MAC_FRAME_COREVIDEO CoreVideo ${CMAKE_SYSTEM_FRAMEWORK_PATH} REQUIRED) find_library(MAC_FRAME_COREVIDEO CoreVideo ${CMAKE_SYSTEM_FRAMEWORK_PATH} REQUIRED)
find_library(MAC_FRAME_VIDEOTOOLBOX VideoToolbox ${CMAKE_SYSTEM_FRAMEWORK_PATH} REQUIRED) find_library(MAC_FRAME_VIDEOTOOLBOX VideoToolbox ${CMAKE_SYSTEM_FRAMEWORK_PATH} REQUIRED)
if(NOT YASM_FOUND AND NOT NASM_FOUND)
message(FATAL_ERROR
"Neither NASM nor YASM were found. Please install at least one of them."
)
endif()
elseif(LINUX) elseif(LINUX)
if(WITH_GTK3) if(WITH_GTK3)
find_package("GTK3" 2.0) find_package("GTK3" 2.0)
@@ -380,7 +386,7 @@ elseif(LINUX)
if(NOT YASM_FOUND AND NOT NASM_FOUND) if(NOT YASM_FOUND AND NOT NASM_FOUND)
message(FATAL_ERROR message(FATAL_ERROR
"Neither NASM nor YASM were found. Please install at least one of them if you wish for ffmpeg support." "Neither NASM nor YASM were found. Please install at least one of them."
) )
endif() endif()