Fix dependencies build on M1.

This commit is contained in:
John Preston 2021-12-14 11:33:59 +04:00
parent 107a87c7ce
commit 19320cc5d8
2 changed files with 6 additions and 5 deletions

View File

@ -491,7 +491,7 @@ mac:
-D ENABLE_SHARED=OFF \\
-D PNG_SUPPORTED=OFF
cmake --build build.arm64 $MAKE_THREADS_CNT
CFLAGS="-arch x86_64" cmake -B build.x86_64 . \\
CFLAGS="-arch x86_64" cmake -B build . \\
-D CMAKE_SYSTEM_NAME=Darwin \\
-D CMAKE_SYSTEM_PROCESSOR=x86_64 \\
-D CMAKE_BUILD_TYPE=Release \\
@ -500,9 +500,9 @@ mac:
-D WITH_JPEG8=ON \\
-D ENABLE_SHARED=OFF \\
-D PNG_SUPPORTED=OFF
cmake --build build.x86_64 $MAKE_THREADS_CNT
lipo -create build.arm64/libjpeg.a build.x86_64/libjpeg.a -output build/libjpeg.a
lipo -create build.arm64/libturbojpeg.a build.x86_64/libturbojpeg.a -output build/libturbojpeg.a
cmake --build build $MAKE_THREADS_CNT
lipo -create build.arm64/libjpeg.a build/libjpeg.a -output build/libjpeg.a
lipo -create build.arm64/libturbojpeg.a build/libturbojpeg.a -output build/libturbojpeg.a
cmake --install build
""")
@ -638,6 +638,7 @@ depends:patches/build_ffmpeg_win.sh
SET PATH=%PATH_BACKUP_%
mac:
export PKG_CONFIG_PATH=$USED_PREFIX/lib/pkgconfig
depends:yasm/yasm
./configure --prefix=$USED_PREFIX \
--enable-cross-compile \

View File

@ -13,7 +13,7 @@ You will require **api_id** and **api_hash** to access the Telegram API servers.
Go to ***BuildPath*** and run
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
brew install automake cmake fdk-aac git lame libass libtool libvorbis libvpx ninja opus sdl shtool texi2html theora wget x264 xvid yasm pkg-config gnu-tar
brew install git automake cmake wget pkg-config gnu-tar
sudo xcode-select -s /Applications/Xcode.app/Contents/Developer