ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-09-01 18:33:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bundle gas-preprocessor.pl, remove external dependency

Browse Source
This commit is contained in:
Peter 2019-03-26 15:12:10 +04:00
parent 4ea8057cf2
commit b814d772a6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
FFMpeg/build-ffmpeg.sh
View File

@ -19,6 +19,8 @@ SOURCE_DIR=$4
FF_VERSION="4.1" FF_VERSION="4.1"
SOURCE="$SOURCE_DIR/ffmpeg-$FF_VERSION" SOURCE="$SOURCE_DIR/ffmpeg-$FF_VERSION"
GAS_PREPROCESSOR_PATH="$SOURCE_DIR/../gas-preprocessor.pl"
FAT="$BUILD_DIR/FFmpeg-iOS" FAT="$BUILD_DIR/FFmpeg-iOS"
SCRATCH="$BUILD_DIR/scratch" SCRATCH="$BUILD_DIR/scratch"
@ -89,11 +91,10 @@ then
echo 'pkg-config not found' echo 'pkg-config not found'
exit 1 exit 1
fi fi
if [ ! `which gas-preprocessor.pl` ] if [ ! `which "$GAS_PREPROCESSOR_PATH"` ]
then then
echo 'gas-preprocessor.pl not found.' echo '$GAS_PREPROCESSOR_PATH not found.'
exit 1 exit 1
#curl -L https://github.com/libav/gas-preprocessor/raw/master/gas-preprocessor.pl -o /usr/local/bin/gas-preprocessor.pl && chmod +x /usr/local/bin/gas-preprocessor.pl
fi fi
if [ ! -r $SOURCE ] if [ ! -r $SOURCE ]
@ -143,12 +144,11 @@ then
XCRUN_SDK=`echo $PLATFORM | tr '[:upper:]' '[:lower:]'` XCRUN_SDK=`echo $PLATFORM | tr '[:upper:]' '[:lower:]'`
CC="xcrun -sdk $XCRUN_SDK clang" CC="xcrun -sdk $XCRUN_SDK clang"
# force "configure" to use "gas-preprocessor.pl" (FFmpeg 3.3)
if [ "$ARCH" = "arm64" ] if [ "$ARCH" = "arm64" ]
then then
AS="gas-preprocessor.pl -arch aarch64 -- $CC" AS="$GAS_PREPROCESSOR_PATH -arch aarch64 -- $CC"
else else
AS="gas-preprocessor.pl -- $CC" AS="$GAS_PREPROCESSOR_PATH -- $CC"
fi fi
CXXFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS"