From 19320cc5d8f0374bc5131ebe73926cdb0ef15ce0 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 14 Dec 2021 11:33:59 +0400 Subject: [PATCH] Fix dependencies build on M1. --- Telegram/build/prepare/prepare.py | 9 +++++---- docs/building-mac.md | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index b693e3a38..991444d1b 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -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 \ diff --git a/docs/building-mac.md b/docs/building-mac.md index d2d0ab408..4d1b5888c 100644 --- a/docs/building-mac.md +++ b/docs/building-mac.md @@ -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