mirror of
https://github.com/RPCS3/ffmpeg-core.git
synced 2025-04-17 14:00:05 +00:00
ci: build and use universal binary on macOS
This commit is contained in:
parent
082e6f4e0b
commit
aee03a7a1b
13
.github/workflows/build.yml
vendored
13
.github/workflows/build.yml
vendored
@ -11,7 +11,7 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
# os: [ubuntu-latest, windows-latest, macos-latest]
|
||||
build: [ubuntu-x64, windows-x64, macos-x64, macos-arm64]
|
||||
build: [ubuntu-x64, windows-x64, macos-universal]
|
||||
config: [Release]
|
||||
include:
|
||||
- build: ubuntu-x64
|
||||
@ -24,16 +24,11 @@ jobs:
|
||||
triplet: x64-win-llvm-static-release
|
||||
vcpkg-root: C:\vcpkg
|
||||
extra-args: --overlay-triplets=./triplets
|
||||
- build: macos-x64
|
||||
- build: macos-universal
|
||||
os: macos-latest
|
||||
triplet: x64-osx-release
|
||||
triplet: universal-osx-release
|
||||
vcpkg-root: /usr/local/share/vcpkg
|
||||
extra-args: ""
|
||||
- build: macos-arm64
|
||||
os: macos-latest
|
||||
triplet: arm64-osx-release
|
||||
vcpkg-root: /usr/local/share/vcpkg
|
||||
extra-args: ""
|
||||
extra-args: --overlay-triplets=./triplets
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
|
@ -16,12 +16,12 @@ if (WIN32 AND NOT MINGW)
|
||||
"psapi;strmiids;uuid;oleaut32;shlwapi;ws2_32;ole32;user32;bcrypt")
|
||||
elseif (APPLE)
|
||||
target_link_libraries(${FFMPEG_CORE_NAME} INTERFACE
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/${ARCHITECTURE}/libavformat.a"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/${ARCHITECTURE}/libavcodec.a"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/${ARCHITECTURE}/libswscale.a"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/${ARCHITECTURE}/libavutil.a"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/${ARCHITECTURE}/libavfilter.a"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/${ARCHITECTURE}/libswresample.a"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/libavformat.a"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/libavcodec.a"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/libswscale.a"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/libavutil.a"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/libavfilter.a"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/libswresample.a"
|
||||
"-framework CoreServices" "-framework CoreFoundation" "-framework AudioUnit"
|
||||
"-framework AudioToolbox" "-framework CoreAudio" "-framework CoreMedia"
|
||||
"-framework VideoToolbox" "-framework CoreVideo" "-framework Security")
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
8
triplets/universal-osx-release.cmake
Normal file
8
triplets/universal-osx-release.cmake
Normal file
@ -0,0 +1,8 @@
|
||||
set(VCPKG_TARGET_ARCHITECTURE arm64 x86_64)
|
||||
set(VCPKG_CRT_LINKAGE dynamic)
|
||||
set(VCPKG_LIBRARY_LINKAGE static)
|
||||
|
||||
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
|
||||
set(VCPKG_OSX_ARCHITECTURES arm64 x86_64)
|
||||
|
||||
set(VCPKG_BUILD_TYPE release)
|
Loading…
x
Reference in New Issue
Block a user