From b8e2a2908a55f77b623f4a3f3813b9718bf7e7af Mon Sep 17 00:00:00 2001
From: Changbeom Ahn <kewlbear@gmail.com>
Date: Mon, 23 Sep 2013 12:35:47 +0900
Subject: [PATCH] modified to support Xcode5 and 64-bit architectures

---
 README.md       | 14 +++++++++-----
 build-ffmpeg.sh | 20 +++++++++++++++-----
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 1231f3b1..b5631a8b 100644
--- a/README.md
+++ b/README.md
@@ -6,18 +6,22 @@ This is a shell script to build FFmpeg libraries for iOS apps.
 Tested with:
 
 * FFmpeg git commit f18ccb529fb7231f9d40814fbf843d10d9434b43
-* Xcode 4.6.3
+* Xcode 5
 
 Usage
 -----
 
-* To build armv7s libraries:
+* To build everything:
 
-        ./build-ffmpeg.sh armv7s
+	./build-ffmpeg.sh
 
-* To build fat libraries for armv7 and i386 (simulator):
+* To build arm64 libraries:
 
-        ./build-ffmpeg.sh armv7 i386
+        ./build-ffmpeg.sh arm64
+
+* To build fat libraries for armv7 and x86_64 (64-bit simulator):
+
+        ./build-ffmpeg.sh armv7 x86_64
 
 * To build fat libraries from separately built thin libraries:
 
diff --git a/build-ffmpeg.sh b/build-ffmpeg.sh
index 3366259d..1f3fd2db 100755
--- a/build-ffmpeg.sh
+++ b/build-ffmpeg.sh
@@ -8,7 +8,7 @@ CONFIGURE_FLAGS="--enable-cross-compile --disable-debug --disable-ffmpeg \
 LIBS="libavcodec libavformat libavutil libswscale libavdevice libavfilter \
       libswresample"
 
-ARCHS="armv7 armv7s i386"
+ARCHS="armv7 armv7s i386 arm64 x86_64"
 
 # directories
 SOURCE="ffmpeg"
@@ -46,22 +46,32 @@ then
 		mkdir -p "$SCRATCH/$ARCH"
 		cd "$SCRATCH/$ARCH"
 
-		if [ "$ARCH" = "i386" ]
+		if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]
 		then
 		    PLATFORM="iPhoneSimulator"
+		    CPU=
+		    if [ "$ARCH" = "x86_64" ]
+		    then
+		    	SIMULATOR="-mios-simulator-version-min=7.0"
+		    else
+		    	SIMULATOR="-mios-simulator-version-min=5.0"
+		    fi
 		else
 		    PLATFORM="iPhoneOS"
 		    if [ $ARCH = "armv7s" ]
 		    then
 		    	CPU="--cpu=swift"
+		    else
+		    	CPU=
 		    fi
+		    SIMULATOR=
 		fi
 
 		XCRUN_SDK=`echo $PLATFORM | tr '[:upper:]' '[:lower:]'`
 		CC="xcrun -sdk $XCRUN_SDK clang"
-		CFLAGS="-arch $ARCH"
-		CXXFLAGS="-arch $ARCH"
-		LDFLAGS="-arch $ARCH"
+		CFLAGS="-arch $ARCH $SIMULATOR"
+		CXXFLAGS="$CFLAGS"
+		LDFLAGS="$CFLAGS"
 
 		$CWD/$SOURCE/configure \
 		    --target-os=darwin \