Commit 39e59da2 authored by Felix Paul Kühne's avatar Felix Paul Kühne

MVK: fix simulator compilation

parent 7b47767d
......@@ -313,7 +313,6 @@
INSTALL_PATH = /usr/local/lib;
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
PRODUCT_NAME = MobileVLCKit;
VALID_ARCHS = "armv7 i386 armv7s arm64";
VLC_SRC_DIR = "$(PROJECT_DIR)/MobileVLCKit/ImportedSources/vlc";
};
name = Debug;
......@@ -332,7 +331,6 @@
INSTALL_PATH = /usr/local/lib;
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
PRODUCT_NAME = MobileVLCKit;
VALID_ARCHS = "armv7 i386 armv7s arm64";
VLC_SRC_DIR = "$(PROJECT_DIR)/MobileVLCKit/ImportedSources/vlc";
};
name = Release;
......
From 49042e5effdf3e046636a2e7a204c0109535df88 Mon Sep 17 00:00:00 2001
From e9bf490eb79beb2661efb38eb08b47bf5adefea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 22 Jan 2014 03:05:48 +0100
Subject: [PATCH 26/26] extras/ios: simulator doesn't necessarily mean i386
Subject: [PATCH 26/29] extras/ios: simulator doesn't necessarily mean i386
anymore
---
......@@ -9,7 +9,7 @@ Subject: [PATCH 26/26] extras/ios: simulator doesn't necessarily mean i386
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index 6e42216..84e05f8 100755
index 6e42216..9f57b14 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -76,8 +76,7 @@ fi
......@@ -27,7 +27,7 @@ index 6e42216..84e05f8 100755
fi
-../bootstrap --host=${TARGET} --build="i686-apple-darwin10" --prefix=${VLCROOT}/contrib/${TARGET}-${ARCH} --arch=${ARCH} --disable-gpl \
+../bootstrap --host=${TARGET} --build="${ARCH}-apple-darwin10" --prefix=${VLCROOT}/contrib/${TARGET}-${ARCH} --arch=${ARCH} --disable-gpl \
+../bootstrap --host=x86_64-apple-darwin11 --build=${TARGET} --prefix=${VLCROOT}/contrib/${TARGET}-${ARCH} --arch=${ARCH} --disable-gpl \
--disable-disc --disable-sout \
--disable-sdl \
--disable-SDL_image \
......
From cb8df005549bd384afabeda65603647778b910fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 22 Jan 2014 09:56:23 +0100
Subject: [PATCH 27/29] contrib/gcrypt: disable asm on iOS
---
contrib/src/gcrypt/rules.mak | 3 +++
1 file changed, 3 insertions(+)
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 44dfcab..4fa1be0 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -36,6 +36,9 @@ GCRYPT_CONF += --disable-asm
endif
ifdef HAVE_DARWIN_OS
GCRYPT_CONF += --disable-aesni-support
+ifdef HAVE_IOS
+GCRYPT_CONF += --disable-asm
+endif
else
ifdef HAVE_BSD
GCRYPT_CONF += --disable-asm --disable-aesni-support
--
1.8.3.4 (Apple Git-47)
From 1d0384598544fe52176003898918b595cd344909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 22 Jan 2014 12:20:52 +0100
Subject: [PATCH 28/29] contrib/png: fix asm compilation for ARMv7
---
contrib/src/png/rules.mak | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/contrib/src/png/rules.mak b/contrib/src/png/rules.mak
index d76206e..4f12595 100644
--- a/contrib/src/png/rules.mak
+++ b/contrib/src/png/rules.mak
@@ -9,7 +9,9 @@ endif
PNGCONF =
ifdef HAVE_IOS
-ifeq ($(ARCH),arm64)
+ifdef HAVE_ARMV7A
+PNGCONF = --enable-arm-neon=yes
+else
PNGCONF = --enable-arm-neon=no
endif
endif
--
1.8.3.4 (Apple Git-47)
From fafa89aad243d2e2e8f215ae07f9f2d20f5ba169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 22 Jan 2014 12:21:12 +0100
Subject: [PATCH 29/29] contrib: fix iOS simulator architecture features
---
contrib/bootstrap | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/contrib/bootstrap b/contrib/bootstrap
index bddb1a8..53a8f6c 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -225,10 +225,13 @@ case "${OS}" in
add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
else
check_ios_sdk
- add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON"
- if [ "$ARCH" != "arm64" ]; then
- add_make_enabled "HAVE_ARMV7A"
- fi
+ add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD"
+ if [ "$ARCH" != "x86_64" && "$ARCH" != "i386" ]; then
+ add_make_enabled "HAVE_NEON"
+ if [ "$ARCH" != "arm64" ]; then
+ add_make_enabled "HAVE_ARMV7A"
+ fi
+ fi
fi
;;
*bsd*)
--
1.8.3.4 (Apple Git-47)
......@@ -164,7 +164,7 @@ if [ "$PLATFORM" = "iphonesimulator" ]; then
args="${args} -s"
./build.sh -a i386 ${args} -k "${SDK}" && ./build.sh -a x86_64 ${args} -k "${SDK}"
else
./build.sh -a armv7 ${args} -k "${SDK}" && ./build.sh -a armv7s ${args} -k "${SDK}"
./build.sh -a armv7 ${args} -k "${SDK}" && ./build.sh -a armv7s ${args} -k "${SDK}" && ./build.sh -a arm64 ${args} -k "${SDK}"
fi
spopd
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment