Update paths to vlc dir, update valid archs for the project

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

MobileVLCKit.xcodeproj/project.pbxproj

@@ -293,7 +293,7 @@
 			baseConfigurationReference = 7A5ECB3311DE948C00F66AF3 /* MobileVLCKit.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = armv7;
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				COPY_PHASE_STRIP = NO;
 				DSTROOT = /tmp/MobileVLCKit.dst;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -305,7 +305,7 @@
 				INSTALL_PATH = /usr/local/lib;
 				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
 				PRODUCT_NAME = MobileVLCKit;
-				VALID_ARCHS = "armv7 i386";
+				VALID_ARCHS = "armv7 i386 armv7s";
 				VLC_SRC_DIR = "$(PROJECT_DIR)/../vlc";
 			};
 			name = Debug;
@@ -315,7 +315,7 @@
 			baseConfigurationReference = 7A5ECB3311DE948C00F66AF3 /* MobileVLCKit.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = armv7;
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				DSTROOT = /tmp/MobileVLCKit.dst;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = MobileVLCKit_Prefix.pch;
@@ -324,7 +324,7 @@
 				INSTALL_PATH = /usr/local/lib;
 				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
 				PRODUCT_NAME = MobileVLCKit;
-				VALID_ARCHS = "armv7 i386";
+				VALID_ARCHS = "armv7 i386 armv7s";
 				VLC_SRC_DIR = "$(PROJECT_DIR)/../vlc";
 			};
 			name = Release;

MobileVLCKit/AggregateStaticPlugins.sh

@@ -13,19 +13,18 @@ popd > /dev/null
 
 echo "PROJECT DIR = $PROJECT_DIR"
 
-VLC_ARCH="arm"
 ARCH=$ARCHS
 VLC_SRC_DIR="$PROJECT_DIR/../../vlc"
 
-if test "$ARCH" = "armv7"; then
-VLC_BUILD_DIR="$VLC_SRC_DIR/build-ios-OS"
-VLC_INSTALL_DIR="$VLC_SRC_DIR/install-ios-OS"
+if [ "$PLATFORM_NAME" = "iphoneos" ]; then
+VLC_BUILD_DIR="$VLC_SRC_DIR/build-ios-OS/$CURRENT_ARCH"
+VLC_INSTALL_DIR="$VLC_SRC_DIR/install-ios-OS/$CURRENT_ARCH"
 else
-VLC_BUILD_DIR="$VLC_SRC_DIR/build-ios-Simulator"
-VLC_INSTALL_DIR="$VLC_SRC_DIR/install-ios-Simulator"
+VLC_BUILD_DIR="$VLC_SRC_DIR/build-ios-Simulator/$CURRENT_ARCH"
+VLC_INSTALL_DIR="$VLC_SRC_DIR/install-ios-Simulator/$CURRENT_ARCH"
 fi
 
-VLC_CONTRIB_DIR="$VLC_SRC_DIR/contrib/\$(VLC_ARCH)-apple-darwin11"
+VLC_CONTRIB_DIR="$VLC_INSTAL_DIR/contribs/"
 LDFLAGS=""
 
 echo "VLC_BUILD_DIR   = $VLC_BUILD_DIR"

MobileVLCKit/MobileVLCKit.xcconfig

@@ -8,16 +8,14 @@
 
 
 VLC_SRC_DIR=$(PROJECT_DIR)/../../..
-VLC_ARCH[sdk=iphonesimulator*]=i686
-VLC_ARCH[sdk=iphoneos*]=arm
 VLC_PLATFORM[sdk=iphonesimulator*]=Simulator
 VLC_PLATFORM[sdk=iphoneos*]=OS
-VLC_INSTALL_DIR=$(VLC_SRC_DIR)/install-ios-$(VLC_PLATFORM)
+VLC_INSTALL_DIR=$(VLC_SRC_DIR)/install-ios-$(VLC_PLATFORM)/$(CURRENT_ARCH)
 
 //OTHER_CFLAGS= -ObjC -all_load
 #include "vlc-plugins.xcconfig"
 
-VLC_CONTRIB_DIR=$VLC_SRC_DIR/contrib/$(VLC_ARCH)-apple-darwin11
+VLC_CONTRIB_DIR=$VLC_INSTALL_DIR/contribs
 A52=$(VLC_CONTRIB_DIR)/lib/liba52.a
 AVCODEC=$(VLC_CONTRIB_DIR)/lib/libavutil.a ${VLC_CONTRIB_DIR}/lib/libavcodec.a $(VLC_CONTRIB_DIR)/lib/libavformat.a $(VLC_CONTRIB_DIR)/lib/libavresample.a $(VLC_CONTRIB_DIR)/lib/libswscale.a $(VLC_CONTRIB_DIR)/lib/libpostproc.a $(VLC_CONTRIB_DIR)/lib/libgsm.a
 DCA=$(VLC_CONTRIB_DIR)/lib/libdca.a