Fix dependencies build on M1.
This commit is contained in:
parent
107a87c7ce
commit
19320cc5d8
|
@ -491,7 +491,7 @@ mac:
|
||||||
-D ENABLE_SHARED=OFF \\
|
-D ENABLE_SHARED=OFF \\
|
||||||
-D PNG_SUPPORTED=OFF
|
-D PNG_SUPPORTED=OFF
|
||||||
cmake --build build.arm64 $MAKE_THREADS_CNT
|
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_NAME=Darwin \\
|
||||||
-D CMAKE_SYSTEM_PROCESSOR=x86_64 \\
|
-D CMAKE_SYSTEM_PROCESSOR=x86_64 \\
|
||||||
-D CMAKE_BUILD_TYPE=Release \\
|
-D CMAKE_BUILD_TYPE=Release \\
|
||||||
|
@ -500,9 +500,9 @@ mac:
|
||||||
-D WITH_JPEG8=ON \\
|
-D WITH_JPEG8=ON \\
|
||||||
-D ENABLE_SHARED=OFF \\
|
-D ENABLE_SHARED=OFF \\
|
||||||
-D PNG_SUPPORTED=OFF
|
-D PNG_SUPPORTED=OFF
|
||||||
cmake --build build.x86_64 $MAKE_THREADS_CNT
|
cmake --build build $MAKE_THREADS_CNT
|
||||||
lipo -create build.arm64/libjpeg.a build.x86_64/libjpeg.a -output build/libjpeg.a
|
lipo -create build.arm64/libjpeg.a build/libjpeg.a -output build/libjpeg.a
|
||||||
lipo -create build.arm64/libturbojpeg.a build.x86_64/libturbojpeg.a -output build/libturbojpeg.a
|
lipo -create build.arm64/libturbojpeg.a build/libturbojpeg.a -output build/libturbojpeg.a
|
||||||
cmake --install build
|
cmake --install build
|
||||||
""")
|
""")
|
||||||
|
|
||||||
|
@ -638,6 +638,7 @@ depends:patches/build_ffmpeg_win.sh
|
||||||
|
|
||||||
SET PATH=%PATH_BACKUP_%
|
SET PATH=%PATH_BACKUP_%
|
||||||
mac:
|
mac:
|
||||||
|
export PKG_CONFIG_PATH=$USED_PREFIX/lib/pkgconfig
|
||||||
depends:yasm/yasm
|
depends:yasm/yasm
|
||||||
./configure --prefix=$USED_PREFIX \
|
./configure --prefix=$USED_PREFIX \
|
||||||
--enable-cross-compile \
|
--enable-cross-compile \
|
||||||
|
|
|
@ -13,7 +13,7 @@ You will require **api_id** and **api_hash** to access the Telegram API servers.
|
||||||
Go to ***BuildPath*** and run
|
Go to ***BuildPath*** and run
|
||||||
|
|
||||||
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
|
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
|
sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue