Skip to content

Commit b8e2a29

Browse files
committed
modified to support Xcode5 and 64-bit architectures
1 parent bba0bff commit b8e2a29

File tree

2 files changed

+24
-10
lines changed

2 files changed

+24
-10
lines changed

README.md

+9-5
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,22 @@ This is a shell script to build FFmpeg libraries for iOS apps.
66
Tested with:
77

88
* FFmpeg git commit f18ccb529fb7231f9d40814fbf843d10d9434b43
9-
* Xcode 4.6.3
9+
* Xcode 5
1010

1111
Usage
1212
-----
1313

14-
* To build armv7s libraries:
14+
* To build everything:
1515

16-
./build-ffmpeg.sh armv7s
16+
./build-ffmpeg.sh
1717

18-
* To build fat libraries for armv7 and i386 (simulator):
18+
* To build arm64 libraries:
1919

20-
./build-ffmpeg.sh armv7 i386
20+
./build-ffmpeg.sh arm64
21+
22+
* To build fat libraries for armv7 and x86_64 (64-bit simulator):
23+
24+
./build-ffmpeg.sh armv7 x86_64
2125

2226
* To build fat libraries from separately built thin libraries:
2327

build-ffmpeg.sh

+15-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CONFIGURE_FLAGS="--enable-cross-compile --disable-debug --disable-ffmpeg \
88
LIBS="libavcodec libavformat libavutil libswscale libavdevice libavfilter \
99
libswresample"
1010

11-
ARCHS="armv7 armv7s i386"
11+
ARCHS="armv7 armv7s i386 arm64 x86_64"
1212

1313
# directories
1414
SOURCE="ffmpeg"
@@ -46,22 +46,32 @@ then
4646
mkdir -p "$SCRATCH/$ARCH"
4747
cd "$SCRATCH/$ARCH"
4848

49-
if [ "$ARCH" = "i386" ]
49+
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]
5050
then
5151
PLATFORM="iPhoneSimulator"
52+
CPU=
53+
if [ "$ARCH" = "x86_64" ]
54+
then
55+
SIMULATOR="-mios-simulator-version-min=7.0"
56+
else
57+
SIMULATOR="-mios-simulator-version-min=5.0"
58+
fi
5259
else
5360
PLATFORM="iPhoneOS"
5461
if [ $ARCH = "armv7s" ]
5562
then
5663
CPU="--cpu=swift"
64+
else
65+
CPU=
5766
fi
67+
SIMULATOR=
5868
fi
5969

6070
XCRUN_SDK=`echo $PLATFORM | tr '[:upper:]' '[:lower:]'`
6171
CC="xcrun -sdk $XCRUN_SDK clang"
62-
CFLAGS="-arch $ARCH"
63-
CXXFLAGS="-arch $ARCH"
64-
LDFLAGS="-arch $ARCH"
72+
CFLAGS="-arch $ARCH $SIMULATOR"
73+
CXXFLAGS="$CFLAGS"
74+
LDFLAGS="$CFLAGS"
6575

6676
$CWD/$SOURCE/configure \
6777
--target-os=darwin \

0 commit comments

Comments
 (0)