Commit e5a880c

author

Changbeom Ahn

committed

update for 3.3

1 parent ad90718 commit e5a880cCopy full SHA for e5a880c

File tree

+14

-4

lines changed

+14

-4

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ This is a shell script to build FFmpeg libraries for iOS and tvOS apps.`
`7`	`7`
`8`	`8`	`Tested with:`
`9`	`9`
`10`		`-* FFmpeg 3.2`
`11`		`-* Xcode 8`
	`10`	`+* FFmpeg 3.3`
	`11`	`+* Xcode 8.3.2`
`12`	`12`
`13`	`13`	`## Requirements`
`14`	`14`
`@@ -37,7 +37,7 @@ Use build-ffmpeg-tvos.sh for tvOS.`
`37`	`37`
`38`	`38`	`## Download`
`39`	`39`
`40`		`-You can download a binary for FFmpeg 3.2 release at https://downloads.sourceforge.net/project/ffmpeg-ios/ffmpeg-ios-master.tar.bz2`
	`40`	`+You can download a binary for FFmpeg 3.3 release at https://downloads.sourceforge.net/project/ffmpeg-ios/ffmpeg-ios-master.tar.bz2`
`41`	`41`
`42`	`42`	`## External libraries`
`43`	`43`

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`	`3`	`# directories`
`4`		`-SOURCE="ffmpeg-3.2"`
	`4`	`+SOURCE="ffmpeg-3.3"`
`5`	`5`	`FAT="FFmpeg-iOS"`
`6`	`6`
`7`	`7`	`SCRATCH="scratch"`
`@@ -105,6 +105,15 @@ then`
`105`	`105`
`106`	`106`	XCRUN_SDK=`echo $PLATFORM \| tr '[:upper:]' '[:lower:]'`
`107`	`107`	`CC="xcrun -sdk $XCRUN_SDK clang"`
	`108`	`+`
	`109`	`+ # force "configure" to use "gas-preprocessor.pl" (FFmpeg 3.3)`
	`110`	`+ if [ "$ARCH" = "arm64" ]`
	`111`	`+ then`
	`112`	`+ AS="gas-preprocessor.pl -arch aarch64 -- $CC"`
	`113`	`+ else`
	`114`	`+ AS="$CC"`
	`115`	`+ fi`
	`116`	`+`
`108`	`117`	`CXXFLAGS="$CFLAGS"`
`109`	`118`	`LDFLAGS="$CFLAGS"`
`110`	`119`	`if [ "$X264" ]`
`@@ -122,6 +131,7 @@ then`
`122`	`131`	`--target-os=darwin \`
`123`	`132`	`--arch=$ARCH \`
`124`	`133`	`--cc="$CC" \`
	`134`	`+ --as="$AS" \`
`125`	`135`	`$CONFIGURE_FLAGS \`
`126`	`136`	`--extra-cflags="$CFLAGS" \`
`127`	`137`	`--extra-ldflags="$LDFLAGS" \`

Comments

(0)