macOS arm64 (#591)

This commit is contained in:
Brad Richardson
2022-12-20 14:38:50 -05:00
committed by GitHub
parent 302bf58631
commit 7a23d6aa81
5 changed files with 12 additions and 2 deletions
+4
View File
@@ -38,3 +38,7 @@
path = third-party/ffmpeg-linux-aarch64 path = third-party/ffmpeg-linux-aarch64
url = https://github.com/LizardByte/build-deps url = https://github.com/LizardByte/build-deps
branch = ffmpeg-linux-aarch64 branch = ffmpeg-linux-aarch64
[submodule "ffmpeg-macos-aarch64"]
path = third-party/ffmpeg-macos-aarch64
url = https://github.com/LizardByte/build-deps
branch = ffmpeg-macos-aarch64
+4
View File
@@ -375,7 +375,11 @@ if(WIN32)
set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-windows-x86_64") set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-windows-x86_64")
set(FFMPEG_PLATFORM_LIBRARIES mfplat ole32 strmiids mfuuid) set(FFMPEG_PLATFORM_LIBRARIES mfplat ole32 strmiids mfuuid)
elseif(APPLE) elseif(APPLE)
if (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-macos-aarch64")
else()
set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-macos-x86_64") set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-macos-x86_64")
endif()
else() else()
if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-linux-aarch64") set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-linux-aarch64")
+1 -1
View File
@@ -12,7 +12,7 @@ MacPorts
Install Requirements Install Requirements
.. code-block:: bash .. code-block:: bash
sudo port install boost cmake libopus npm9 sudo port install avahi boost180 cmake curl libopus npm9 pkgconfig
Homebrew Homebrew
"""""""" """"""""
+1
View File
@@ -32,6 +32,7 @@ post-fetch {
} }
depends_lib port:avahi \ depends_lib port:avahi \
port:boost180 \
port:curl \ port:curl \
port:libopus \ port:libopus \
port:npm9 \ port:npm9 \