switch to modern VLCKit build system

SharedSources/MLMediaLibrary+playlist.h

@@ -12,8 +12,6 @@
  * Refer to the COPYING file of the official project for license.
  *****************************************************************************/
 
-#import <MediaLibraryKit/MLMediaLibrary.h>
-
 typedef enum {
     VLCLibraryModeAllFiles  = 0,
     VLCLibraryModeAllAlbums = 1,

SharedSources/MLMediaLibrary+playlist.m

@@ -13,8 +13,6 @@
  *****************************************************************************/
 
 #import "MLMediaLibrary+playlist.h"
-#import <UIKit/UIKit.h>
-#import <MediaLibraryKit/MediaLibraryKit.h>
 
 @implementation MLMediaLibrary (playlist)
 

Sources/VLC for iOS-Prefix.pch

@@ -21,8 +21,22 @@
     #import <Foundation/Foundation.h>
 #endif
 
-#import <MobileVLCKit/MobileVLCKit.h>
-#import <MediaLibraryKit/MediaLibraryKit.h>
+#import "VLCAudio.h"
+#import "VLCLibrary.h"
+#import "VLCMedia.h"
+#import "VLCMediaDiscoverer.h"
+#import "VLCMediaList.h"
+#import "VLCMediaPlayer.h"
+#import "VLCMediaListPlayer.h"
+#import "VLCMediaThumbnailer.h"
+#import "VLCTime.h"
+#import "MLFile.h"
+#import "MLLabel.h"
+#import "MLMediaLibrary.h"
+#import "MLShow.h"
+#import "MLShowEpisode.h"
+#import "MLAlbum.h"
+#import "MLAlbumTrack.h"
 
 #import "VLCConstants.h"
 #import "UIColor+Presets.h"

Sources/VLCOneDriveController.m

@@ -15,10 +15,10 @@
 #import "VLCOneDriveObject.h"
 
 /* the Live SDK doesn't have an umbrella header so we need to import what we need */
-#import <LiveSDK/LiveConnectClient.h>
+#import "LiveConnectClient.h"
 
 /* include private API headers */
-#import <LiveSDK/LiveApiHelper.h>
+#import "LiveApiHelper.h"
 
 @interface VLCOneDriveController () <LiveAuthDelegate, VLCOneDriveObjectDelegate, VLCOneDriveObjectDownloadDelegate>
 {

Sources/VLCOneDriveObject.h

@@ -10,7 +10,7 @@
  * Refer to the COPYING file of the official project for license.
  *****************************************************************************/
 
-#import <LiveSDK/LiveConnectClient.h>
+#import "LiveConnectClient.h"
 
 @class VLCOneDriveObject;
 

Sources/VLCPlaybackController+MediaLibrary.m

@@ -11,7 +11,6 @@
  *****************************************************************************/
 
 #import "VLCPlaybackController+MediaLibrary.h"
-#import <MediaLibraryKit/MediaLibraryKit.h>
 #import <CoreData/CoreData.h>
 
 @implementation VLCPlaybackController (MediaLibrary)

Sources/VLCPlaylistTableViewCell.m

@@ -16,7 +16,6 @@
 #import "VLCLinearProgressIndicator.h"
 #import "VLCThumbnailsCache.h"
 #import "NSString+SupportedMedia.h"
-#import <MediaLibraryKit/MLAlbum.h>
 
 @interface VLCPlaylistTableViewCell ()
 {

VLC for iOS WatchKit Extension/VLC for iOS WatchKit Extension-Prefix.pch

@@ -0,0 +1,45 @@
+/*****************************************************************************
+ * Prefix header for all source files of the 'VLC for iOS WK Ext' target
+ * VLC for iOS
+ *****************************************************************************
+ * Copyright (c) 2015 VideoLAN. All rights reserved.
+ * $Id$
+ *
+ * Authors: Felix Paul Kühne <fkuehne # videolan.org>
+ *
+ * Refer to the COPYING file of the official project for license.
+ *****************************************************************************/
+
+#import <Availability.h>
+
+#ifndef __IPHONE_8_2
+#error "This project uses features only available in iOS SDK 8.2 and later."
+#endif
+
+#ifdef __OBJC__
+    #import <UIKit/UIKit.h>
+    #import <Foundation/Foundation.h>
+#endif
+
+#import "VLCAudio.h"
+#import "VLCLibrary.h"
+#import "VLCMedia.h"
+#import "VLCMediaDiscoverer.h"
+#import "VLCMediaList.h"
+#import "VLCMediaPlayer.h"
+#import "VLCMediaListPlayer.h"
+#import "VLCMediaThumbnailer.h"
+#import "VLCTime.h"
+#import "MLFile.h"
+#import "MLLabel.h"
+#import "MLMediaLibrary.h"
+#import "MLShow.h"
+#import "MLShowEpisode.h"
+#import "MLAlbum.h"
+#import "MLAlbumTrack.h"
+
+#ifndef NDEBUG
+#define APLog(format, ...) NSLog(format, ## __VA_ARGS__)
+#else
+#define APLog(format, ...)
+#endif

VLC for iOS WatchKit Extension/VLCDetailInterfaceController.m

@@ -11,7 +11,6 @@
  *****************************************************************************/
 
 #import "VLCDetailInterfaceController.h"
-#import <MediaLibraryKit/MediaLibraryKit.h>
 #import "VLCTime.h"
 #import "VLCThumbnailsCache.h"
 #import "WKInterfaceObject+VLCProgress.h"

VLC for iOS WatchKit Extension/VLCNowPlayingInterfaceController.m

@@ -13,11 +13,10 @@
 #import "VLCNowPlayingInterfaceController.h"
 #import <MediaPlayer/MediaPlayer.h>
 #import "VLCTime.h"
-#import <MediaLibraryKit/MediaLibraryKit.h>
 #import "VLCNotificationRelay.h"
-#import "VLCThumbnailsCache.h"
 #import "WKInterfaceObject+VLCProgress.h"
 #import "VLCWatchMessage.h"
+#import "VLCThumbnailsCache.h"
 
 @interface VLCNowPlayingInterfaceController ()
 {

VLC for iOS WatchKit Extension/VLCPlaylistInterfaceController.m

@@ -13,7 +13,6 @@
  *****************************************************************************/
 
 #import "VLCPlaylistInterfaceController.h"
-#import <MediaLibraryKit/MediaLibraryKit.h>
 #import "VLCRowController.h"
 
 #import "VLCNotificationRelay.h"

VLC for iOS WatchKit Extension/VLCRowController.m

@@ -11,7 +11,6 @@
  *****************************************************************************/
 
 #import "VLCRowController.h"
-#import <MediaLibraryKit/MediaLibraryKit.h>
 #import "WKInterfaceObject+VLCProgress.h"
 #import "VLCThumbnailsCache.h"
 

VLC for iOS.xcodeproj/project.pbxproj

@@ -72,7 +72,6 @@
 		7D0117F1187F4BA400C5671C /* VLCFirstStepsFirstPageViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D0117F0187F4BA400C5671C /* VLCFirstStepsFirstPageViewController~ipad.xib */; };
 		7D0363AC1B2F325500CC0343 /* MediaLibrary.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 7D0363A71B2F325500CC0343 /* MediaLibrary.xcdatamodeld */; };
 		7D0363AD1B2F325500CC0343 /* MediaLibrary.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 7D0363A71B2F325500CC0343 /* MediaLibrary.xcdatamodeld */; };
-		7D1052E61A4DC5FF00295F08 /* LiveSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D1052E51A4DC5FF00295F08 /* LiveSDK.framework */; };
 		7D1052E91A4DCC1100295F08 /* VLCOneDriveTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D1052E81A4DCC1100295F08 /* VLCOneDriveTableViewController.m */; };
 		7D1052EE1A4DCD1E00295F08 /* VLCOneDriveController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D1052ED1A4DCD1E00295F08 /* VLCOneDriveController.m */; };
 		7D1276621AADA0E600F0260C /* VLCMultiSelectionMenuView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D1276611AADA0E600F0260C /* VLCMultiSelectionMenuView.m */; };
@@ -138,17 +137,14 @@
 		7D6B08FC174D773C00A05173 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 7D6B08FB174D773C00A05173 /* Settings.bundle */; };
 		7D711ADA18227A490094E4F0 /* GTMOAuth2ViewTouch.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D711AD918227A490094E4F0 /* GTMOAuth2ViewTouch.xib */; };
 		7D74177A1AE2D3CE001F1997 /* VLCNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D7417791AE2D3CE001F1997 /* VLCNavigationController.m */; };
-		7D7B17F01AD8052B003BF3D7 /* libc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D7B17EC1AD8052A003BF3D7 /* libc++.dylib */; };
 		7D7B17F11AD8052B003BF3D7 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D7B17ED1AD8052B003BF3D7 /* libz.dylib */; };
 		7D84E4C61B41AB2800EA7D1F /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D84E4C51B41AB2800EA7D1F /* VideoToolbox.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		7D84E4C71B41AB6E00EA7D1F /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D84E4C51B41AB2800EA7D1F /* VideoToolbox.framework */; };
 		7D84E4C91B41ABCE00EA7D1F /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D84E4C81B41ABCE00EA7D1F /* CoreMedia.framework */; };
-		7D84E5201B42C6AC00EA7D1F /* libMediaLibraryKit-readonly.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D84E51F1B42C6AC00EA7D1F /* libMediaLibraryKit-readonly.a */; };
 		7D84E5221B42C6E000EA7D1F /* VLCTime.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D84E5211B42C6E000EA7D1F /* VLCTime.m */; };
 		7D871F521AD7257100348D27 /* UIImage+Scaling.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D871F501AD7257100348D27 /* UIImage+Scaling.m */; };
 		7D89786F185DED88009BAB5D /* VLCDownloadViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D89786E185DED88009BAB5D /* VLCDownloadViewController.xib */; };
 		7D89787D185DF794009BAB5D /* VLCOpenNetworkStreamViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D89787C185DF794009BAB5D /* VLCOpenNetworkStreamViewController.xib */; };
-		7D897895185E14A7009BAB5D /* libGTLTouchStaticLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D897894185E14A7009BAB5D /* libGTLTouchStaticLib.a */; };
 		7D9289751877459B009108FD /* VLCFirstStepsThirdPageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D9289731877459B009108FD /* VLCFirstStepsThirdPageViewController.m */; };
 		7D9289761877459B009108FD /* VLCFirstStepsThirdPageViewController~iphone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D9289741877459B009108FD /* VLCFirstStepsThirdPageViewController~iphone.xib */; };
 		7D92897A1877467E009108FD /* VLCFirstStepsFourthPageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D9289781877467E009108FD /* VLCFirstStepsFourthPageViewController.m */; };
@@ -164,6 +160,7 @@
 		7D9870681A3E03D5009CF27D /* papasscode_marker.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D9870621A3E03D5009CF27D /* papasscode_marker.png */; };
 		7D9870691A3E03D5009CF27D /* papasscode_marker@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D9870631A3E03D5009CF27D /* papasscode_marker@2x.png */; };
 		7D9CB9DC1A4C55EF00BB74B4 /* VLCPlaybackNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D9CB9DB1A4C55EF00BB74B4 /* VLCPlaybackNavigationController.m */; };
+		7D9EDC051B502A0600C07909 /* LiveSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D9EDC041B502A0600C07909 /* LiveSDK.framework */; };
 		7DA8B0FB173318E80029698C /* SourceCodePro-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7DA8B0F9173318E80029698C /* SourceCodePro-Regular.ttf */; };
 		7DAE0C2E1B2EDF7A00C53996 /* VLCNetworkListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DAE0C2D1B2EDF7A00C53996 /* VLCNetworkListViewController.m */; };
 		7DAE0C311B2EDFD600C53996 /* VLCUPnPServerListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DAE0C301B2EDFD600C53996 /* VLCUPnPServerListViewController.m */; };
@@ -195,6 +192,10 @@
 		7DC19B0C1868D21800810BF7 /* VLCFirstStepsSixthPageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DC19B0A1868D21800810BF7 /* VLCFirstStepsSixthPageViewController.m */; };
 		7DC72D6317B7ED24008A26D0 /* WhiteRaccoon.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DC72D6217B7ED24008A26D0 /* WhiteRaccoon.m */; };
 		7DD2A3A9179C04A7003EB537 /* OpenSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7DD2A3A8179C04A6003EB537 /* OpenSans-Regular.ttf */; };
+		7DDC02211B50235D0078FC84 /* libMediaLibraryKit-readonly.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DDC02201B50235D0078FC84 /* libMediaLibraryKit-readonly.a */; };
+		7DDC02251B5023E10078FC84 /* libMediaLibraryKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DDC02241B5023E10078FC84 /* libMediaLibraryKit.a */; };
+		7DDC02271B5023EA0078FC84 /* libMobileVLCKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DDC02261B5023EA0078FC84 /* libMobileVLCKit.a */; };
+		7DDC02291B5023F50078FC84 /* libGTLTouchStaticLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DDC02281B5023F50078FC84 /* libGTLTouchStaticLib.a */; };
 		7DDD0429172D98E5005A7B10 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DDD0428172D98E5005A7B10 /* CFNetwork.framework */; };
 		7DE56C1A1AD93F9100E8CA00 /* VLCPlaybackController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DE56C191AD93F9100E8CA00 /* VLCPlaybackController.m */; };
 		7DE715ED1AD2DAE50075E716 /* VLCThumbnailsCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D37849D183A98DD009EE944 /* VLCThumbnailsCache.m */; };
@@ -212,9 +213,7 @@
 		9B9231C4185A703700F89498 /* VLCNetworkLoginViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9B9231C3185A703700F89498 /* VLCNetworkLoginViewController.xib */; };
 		9BADAF45185FBD9D00108BD8 /* VLCFrostedGlasView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BADAF44185FBD9D00108BD8 /* VLCFrostedGlasView.m */; };
 		9BE4D1CE183D76950006346C /* VLCCloudStorageTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D3784B0183A990F009EE944 /* VLCCloudStorageTableViewCell.m */; };
-		A7924696170F0BA90036AAF2 /* libMediaLibraryKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A7924695170F0BA90036AAF2 /* libMediaLibraryKit.a */; };
 		A79246C8170F11DF0036AAF2 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = A79246C6170F11DF0036AAF2 /* Localizable.strings */; };
-		CC1BBC3F1704934300A20CBF /* libMobileVLCKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CC1BBC3E1704934200A20CBF /* libMobileVLCKit.a */; };
 		CC1BBC461704938300A20CBF /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CC1BBC451704938300A20CBF /* libiconv.dylib */; };
 		CC1BBC481704938B00A20CBF /* libstdc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CC1BBC471704938B00A20CBF /* libstdc++.dylib */; };
 		CC1BBC4C1704939B00A20CBF /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CC1BBC4B1704939B00A20CBF /* libsqlite3.dylib */; };
@@ -540,6 +539,7 @@
 		7D4C484417ACF982008D228B /* bs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bs; path = bs.lproj/Localizable.strings; sourceTree = "<group>"; };
 		7D50903018F41C7900180139 /* VLCAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCAlertView.h; path = Sources/VLCAlertView.h; sourceTree = SOURCE_ROOT; };
 		7D50903118F41C7900180139 /* VLCAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCAlertView.m; path = Sources/VLCAlertView.m; sourceTree = SOURCE_ROOT; };
+		7D55B8A41B5031E600EE9AD3 /* VLC for iOS WatchKit Extension-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "VLC for iOS WatchKit Extension-Prefix.pch"; sourceTree = "<group>"; };
 		7D5C204D17999A74004F9443 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/Localizable.strings; sourceTree = "<group>"; };
 		7D5CAA871A4AD763003F2CBC /* VLCTrackSelectorTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCTrackSelectorTableViewCell.h; path = Sources/VLCTrackSelectorTableViewCell.h; sourceTree = SOURCE_ROOT; };
 		7D5CAA881A4AD763003F2CBC /* VLCTrackSelectorTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCTrackSelectorTableViewCell.m; path = Sources/VLCTrackSelectorTableViewCell.m; sourceTree = SOURCE_ROOT; };
@@ -604,6 +604,7 @@
 		7D9B6B0817C9625F00F9425D /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/Localizable.strings; sourceTree = "<group>"; };
 		7D9CB9DA1A4C55EF00BB74B4 /* VLCPlaybackNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCPlaybackNavigationController.h; path = Sources/VLCPlaybackNavigationController.h; sourceTree = SOURCE_ROOT; };
 		7D9CB9DB1A4C55EF00BB74B4 /* VLCPlaybackNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCPlaybackNavigationController.m; path = Sources/VLCPlaybackNavigationController.m; sourceTree = SOURCE_ROOT; };
+		7D9EDC041B502A0600C07909 /* LiveSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LiveSDK.framework; path = "../../../../Library/Developer/Xcode/DerivedData/VLC_for_iOS-bfdonpbpgwegzrcebkdnekvvkdbq/Build/Products/Debug-iphoneos/LiveSDK.framework"; sourceTree = "<group>"; };
 		7DA8B0F9173318E80029698C /* SourceCodePro-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SourceCodePro-Regular.ttf"; sourceTree = "<group>"; };
 		7DAE0C2C1B2EDF7A00C53996 /* VLCNetworkListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCNetworkListViewController.h; path = Sources/VLCNetworkListViewController.h; sourceTree = SOURCE_ROOT; };
 		7DAE0C2D1B2EDF7A00C53996 /* VLCNetworkListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCNetworkListViewController.m; path = Sources/VLCNetworkListViewController.m; sourceTree = SOURCE_ROOT; };
@@ -653,6 +654,11 @@
 		7DC87AF017413A17009DC250 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
 		7DD2A3A8179C04A6003EB537 /* OpenSans-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OpenSans-Regular.ttf"; sourceTree = "<group>"; };
 		7DD32D22194F1946002510A9 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		7DDC02201B50235D0078FC84 /* libMediaLibraryKit-readonly.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libMediaLibraryKit-readonly.a"; path = "../../../../Library/Developer/Xcode/DerivedData/VLC_for_iOS-bfdonpbpgwegzrcebkdnekvvkdbq/Build/Products/Debug-iphoneos/libMediaLibraryKit-readonly.a"; sourceTree = "<group>"; };
+		7DDC02221B5023D70078FC84 /* libMobileVLCKit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libMobileVLCKit.a; path = "ImportedSources/VLCKit/build/Debug-iphoneos/libMobileVLCKit.a"; sourceTree = "<group>"; };
+		7DDC02241B5023E10078FC84 /* libMediaLibraryKit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libMediaLibraryKit.a; path = "../../../../Library/Developer/Xcode/DerivedData/VLC_for_iOS-bfdonpbpgwegzrcebkdnekvvkdbq/Build/Products/Debug-iphoneos/libMediaLibraryKit.a"; sourceTree = "<group>"; };
+		7DDC02261B5023EA0078FC84 /* libMobileVLCKit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libMobileVLCKit.a; path = "ImportedSources/VLCKit/build/Debug-iphoneos/libMobileVLCKit.a"; sourceTree = "<group>"; };
+		7DDC02281B5023F50078FC84 /* libGTLTouchStaticLib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libGTLTouchStaticLib.a; path = "ImportedSources/GDrive/build/Debug-iphoneos/libGTLTouchStaticLib.a"; sourceTree = "<group>"; };
 		7DDD0428172D98E5005A7B10 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
 		7DE56C181AD93F9100E8CA00 /* VLCPlaybackController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCPlaybackController.h; path = Sources/VLCPlaybackController.h; sourceTree = SOURCE_ROOT; };
 		7DE56C191AD93F9100E8CA00 /* VLCPlaybackController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCPlaybackController.m; path = Sources/VLCPlaybackController.m; sourceTree = SOURCE_ROOT; };
@@ -740,7 +746,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7D84E5201B42C6AC00EA7D1F /* libMediaLibraryKit-readonly.a in Frameworks */,
+				7DDC02211B50235D0078FC84 /* libMediaLibraryKit-readonly.a in Frameworks */,
 				7D84E4C71B41AB6E00EA7D1F /* VideoToolbox.framework in Frameworks */,
 				DDF157B51ACB16E500AAFBC6 /* AudioToolbox.framework in Frameworks */,
 				DDF157B41ACB169B00AAFBC6 /* WatchKit.framework in Frameworks */,
@@ -758,7 +764,11 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				7DDC02291B5023F50078FC84 /* libGTLTouchStaticLib.a in Frameworks */,
+				7DDC02271B5023EA0078FC84 /* libMobileVLCKit.a in Frameworks */,
+				7DDC02251B5023E10078FC84 /* libMediaLibraryKit.a in Frameworks */,
 				7D84E4C91B41ABCE00EA7D1F /* CoreMedia.framework in Frameworks */,
+				7D9EDC051B502A0600C07909 /* LiveSDK.framework in Frameworks */,
 				7D84E4C61B41AB2800EA7D1F /* VideoToolbox.framework in Frameworks */,
 				7D298F441AD5827E00A0BF68 /* WatchKit.framework in Frameworks */,
 				8F91EC7F195E1DAB00F5BCBA /* AssetsLibrary.framework in Frameworks */,
@@ -767,8 +777,6 @@
 				7D168F7118D4A21B003FAF59 /* Accelerate.framework in Frameworks */,
 				CCE2A22E17A5859E00D9EAAD /* CoreText.framework in Frameworks */,
 				7DF7CA0717650C2A00C61739 /* AVFoundation.framework in Frameworks */,
-				7D1052E61A4DC5FF00295F08 /* LiveSDK.framework in Frameworks */,
-				7D897895185E14A7009BAB5D /* libGTLTouchStaticLib.a in Frameworks */,
 				7DF7E791175F47DC0018858D /* MediaPlayer.framework in Frameworks */,
 				7D7B17F11AD8052B003BF3D7 /* libz.dylib in Frameworks */,
 				7D6B08FA174D716200A05173 /* MessageUI.framework in Frameworks */,
@@ -784,12 +792,9 @@
 				CC1BBC4C1704939B00A20CBF /* libsqlite3.dylib in Frameworks */,
 				CC1BBC481704938B00A20CBF /* libstdc++.dylib in Frameworks */,
 				CC1BBC461704938300A20CBF /* libiconv.dylib in Frameworks */,
-				CC1BBC3F1704934300A20CBF /* libMobileVLCKit.a in Frameworks */,
 				7D94FCDF16DE7D1000F2623B /* UIKit.framework in Frameworks */,
 				7D94FCE116DE7D1000F2623B /* Foundation.framework in Frameworks */,
 				7D94FCE316DE7D1000F2623B /* CoreGraphics.framework in Frameworks */,
-				A7924696170F0BA90036AAF2 /* libMediaLibraryKit.a in Frameworks */,
-				7D7B17F01AD8052B003BF3D7 /* libc++.dylib in Frameworks */,
 				D9C52A9E9D4D5AFA7EF1B45A /* libPods-vlc-ios.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -974,6 +979,7 @@
 		4173AEA21ABF1B850004101D /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
+				7D55B8A41B5031E600EE9AD3 /* VLC for iOS WatchKit Extension-Prefix.pch */,
 				4173AEA31ABF1B850004101D /* Info.plist */,
 			);
 			name = "Supporting Files";
@@ -1275,6 +1281,12 @@
 		7D94FCDD16DE7D1000F2623B /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				7D9EDC041B502A0600C07909 /* LiveSDK.framework */,
+				7DDC02281B5023F50078FC84 /* libGTLTouchStaticLib.a */,
+				7DDC02261B5023EA0078FC84 /* libMobileVLCKit.a */,
+				7DDC02241B5023E10078FC84 /* libMediaLibraryKit.a */,
+				7DDC02221B5023D70078FC84 /* libMobileVLCKit.a */,
+				7DDC02201B50235D0078FC84 /* libMediaLibraryKit-readonly.a */,
 				7D84E51F1B42C6AC00EA7D1F /* libMediaLibraryKit-readonly.a */,
 				7D84E4C81B41ABCE00EA7D1F /* CoreMedia.framework */,
 				7D84E4C51B41AB2800EA7D1F /* VideoToolbox.framework */,
@@ -2178,6 +2190,12 @@
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"$(SRCROOT)/ImportedSources/VLCKit/Headers/Public",
+					"$(SRCROOT)/ImportedSources/MediaLibraryKit/Headers/Public",
+				);
 				IBSC_MODULE = VLC_for_iOS_WatchKit_Extension;
 				INFOPLIST_FILE = "VLC for iOS WatchKit App/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
@@ -2210,6 +2228,12 @@
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"$(SRCROOT)/ImportedSources/VLCKit/Headers/Public",
+					"$(SRCROOT)/ImportedSources/MediaLibraryKit/Headers/Public",
+				);
 				IBSC_MODULE = VLC_for_iOS_WatchKit_Extension;
 				INFOPLIST_FILE = "VLC for iOS WatchKit App/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
@@ -2242,6 +2266,12 @@
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"$(SRCROOT)/ImportedSources/VLCKit/Headers/Public",
+					"$(SRCROOT)/ImportedSources/MediaLibraryKit/Headers/Public",
+				);
 				IBSC_MODULE = VLC_for_iOS_WatchKit_Extension;
 				INFOPLIST_FILE = "VLC for iOS WatchKit App/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
@@ -2273,6 +2303,8 @@
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "VLC for iOS WatchKit Extension/VLC for iOS WatchKit Extension-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -2283,20 +2315,14 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				HEADER_SEARCH_PATHS = (
-					"$(SRCROOT)/External/MobileVLCKit/include",
-					"$(SRCROOT)/External/MediaLibraryKit/include",
+					"$(SRCROOT)/ImportedSources/VLCKit/Headers/Public",
+					"$(SRCROOT)/ImportedSources/MediaLibraryKit/Headers/Public",
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 				);
 				INFOPLIST_FILE = "VLC for iOS WatchKit Extension/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(SRCROOT)/External/MobileVLCKit/",
-					"$(SRCROOT)/External/MediaLibraryKit/",
-					"$(PROJECT_DIR)/ImportedSources/MediaLibraryKit/build/Debug-iphoneos",
-				);
 				MTL_ENABLE_DEBUG_INFO = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.videolan.vlc-ios.watchkitextension";
 				PRODUCT_NAME = "${TARGET_NAME}";
@@ -2325,26 +2351,22 @@
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "VLC for iOS WatchKit Extension/VLC for iOS WatchKit Extension-Prefix.pch";
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				HEADER_SEARCH_PATHS = (
-					"$(SRCROOT)/External/MobileVLCKit/include",
-					"$(SRCROOT)/External/MediaLibraryKit/include",
+					"$(SRCROOT)/ImportedSources/VLCKit/Headers/Public",
+					"$(SRCROOT)/ImportedSources/MediaLibraryKit/Headers/Public",
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 				);
 				INFOPLIST_FILE = "VLC for iOS WatchKit Extension/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(SRCROOT)/External/MobileVLCKit/",
-					"$(SRCROOT)/External/MediaLibraryKit/",
-					"$(PROJECT_DIR)/ImportedSources/MediaLibraryKit/build/Debug-iphoneos",
-				);
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.videolan.vlc-ios.watchkitextension";
 				PRODUCT_NAME = "${TARGET_NAME}";
@@ -2373,26 +2395,22 @@
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "VLC for iOS WatchKit Extension/VLC for iOS WatchKit Extension-Prefix.pch";
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				HEADER_SEARCH_PATHS = (
-					"$(SRCROOT)/External/MobileVLCKit/include",
-					"$(SRCROOT)/External/MediaLibraryKit/include",
+					"$(SRCROOT)/ImportedSources/VLCKit/Headers/Public",
+					"$(SRCROOT)/ImportedSources/MediaLibraryKit/Headers/Public",
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 				);
 				INFOPLIST_FILE = "VLC for iOS WatchKit Extension/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(SRCROOT)/External/MobileVLCKit/",
-					"$(SRCROOT)/External/MediaLibraryKit/",
-					"$(PROJECT_DIR)/ImportedSources/MediaLibraryKit/build/Debug-iphoneos",
-				);
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.videolan.vlc-ios.watchkitextension";
 				PRODUCT_NAME = "${TARGET_NAME}";
@@ -2482,8 +2500,8 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/ImportedSources/Dropbox",
-					"$(PROJECT_DIR)/External/OneDrive",
 					"$(PROJECT_DIR)",
+					"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/VLC_for_iOS-bfdonpbpgwegzrcebkdnekvvkdbq/Build/Products/Debug-iphoneos",
 				);
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_ENABLE_CPP_EXCEPTIONS = YES;
@@ -2491,8 +2509,8 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Sources/VLC for iOS-Prefix.pch";
 				HEADER_SEARCH_PATHS = (
-					"$(SRCROOT)/External/MobileVLCKit/include",
-					"$(SRCROOT)/External/MediaLibraryKit/include",
+					"$(SRCROOT)/ImportedSources/VLCKit/Headers/Public",
+					"$(SRCROOT)/ImportedSources/MediaLibraryKit/Headers/Public",
 					"$(SRCROOT)/ImportedSources/GDrive/**",
 					"\"$(SRCROOT)/ImportedSources/OneDrive/src/LiveSDK/Library\"/**",
 					"$(inherited)",
@@ -2501,14 +2519,14 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"\"$(SRCROOT)/External/MediaLibraryKit\"",
-					"\"$(SRCROOT)/External/MobileVLCKit\"",
-					"\"$(SRCROOT)/External/gtl\"",
-					"\"$(SDKROOT)/usr/lib/system\"",
+					"$(PROJECT_DIR)/ImportedSources/VLCKit/build/Debug-iphoneos",
+					"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/VLC_for_iOS-bfdonpbpgwegzrcebkdnekvvkdbq/Build/Products/Debug-iphoneos",
+					"$(PROJECT_DIR)/ImportedSources/GDrive/build/Debug-iphoneos",
 				);
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
-					"-Wl,-no_pie",
+					"-read_only_relocs",
+					suppress,
 					"$(inherited)",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.videolan.vlc-ios";
@@ -2541,8 +2559,8 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/ImportedSources/Dropbox",
-					"$(PROJECT_DIR)/External/OneDrive",
 					"$(PROJECT_DIR)",
+					"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/VLC_for_iOS-bfdonpbpgwegzrcebkdnekvvkdbq/Build/Products/Debug-iphoneos",
 				);
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_ENABLE_CPP_EXCEPTIONS = NO;
@@ -2550,8 +2568,8 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Sources/VLC for iOS-Prefix.pch";
 				HEADER_SEARCH_PATHS = (
-					"$(SRCROOT)/External/MobileVLCKit/include",
-					"$(SRCROOT)/External/MediaLibraryKit/include",
+					"$(SRCROOT)/ImportedSources/VLCKit/Headers/Public",
+					"$(SRCROOT)/ImportedSources/MediaLibraryKit/Headers/Public",
 					"$(SRCROOT)/ImportedSources/GDrive/**",
 					"\"$(SRCROOT)/ImportedSources/OneDrive/src/LiveSDK/Library\"/**",
 					"$(inherited)",
@@ -2560,14 +2578,14 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"\"$(SRCROOT)/External/MediaLibraryKit\"",
-					"\"$(SRCROOT)/External/MobileVLCKit\"",
-					"\"$(SRCROOT)/External/gtl\"",
-					"\"$(SDKROOT)/usr/lib/system\"",
+					"$(PROJECT_DIR)/ImportedSources/VLCKit/build/Debug-iphoneos",
+					"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/VLC_for_iOS-bfdonpbpgwegzrcebkdnekvvkdbq/Build/Products/Debug-iphoneos",
+					"$(PROJECT_DIR)/ImportedSources/GDrive/build/Debug-iphoneos",
 				);
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
-					"-Wl,-no_pie",
+					"-read_only_relocs",
+					suppress,
 					"$(inherited)",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.videolan.vlc-ios";
@@ -2627,8 +2645,8 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/ImportedSources/Dropbox",
-					"$(PROJECT_DIR)/External/OneDrive",
 					"$(PROJECT_DIR)",
+					"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/VLC_for_iOS-bfdonpbpgwegzrcebkdnekvvkdbq/Build/Products/Debug-iphoneos",
 				);
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_ENABLE_CPP_EXCEPTIONS = NO;
@@ -2636,8 +2654,8 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Sources/VLC for iOS-Prefix.pch";
 				HEADER_SEARCH_PATHS = (
-					"$(SRCROOT)/External/MobileVLCKit/include",
-					"$(SRCROOT)/External/MediaLibraryKit/include",
+					"$(SRCROOT)/ImportedSources/VLCKit/Headers/Public",
+					"$(SRCROOT)/ImportedSources/MediaLibraryKit/Headers/Public",
 					"$(SRCROOT)/ImportedSources/GDrive/**",
 					"\"$(SRCROOT)/ImportedSources/OneDrive/src/LiveSDK/Library\"/**",
 					"$(inherited)",
@@ -2646,14 +2664,14 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"\"$(SRCROOT)/External/MediaLibraryKit\"",
-					"\"$(SRCROOT)/External/MobileVLCKit\"",
-					"\"$(SRCROOT)/External/gtl\"",
-					"\"$(SDKROOT)/usr/lib/system\"",
+					"$(PROJECT_DIR)/ImportedSources/VLCKit/build/Debug-iphoneos",
+					"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/VLC_for_iOS-bfdonpbpgwegzrcebkdnekvvkdbq/Build/Products/Debug-iphoneos",
+					"$(PROJECT_DIR)/ImportedSources/GDrive/build/Debug-iphoneos",
 				);
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
-					"-Wl,-no_pie",
+					"-read_only_relocs",
+					suppress,
 					"$(inherited)",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.videolan.vlc-ios";

VLC for iOS.xcworkspace/contents.xcworkspacedata

@@ -11,6 +11,12 @@
       location = "group:ImportedSources/VLCKit/MobileVLCKit.xcodeproj">
    </FileRef>
    <FileRef
+      location = "group:ImportedSources/OneDrive/src/LiveSDK.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:ImportedSources/GDrive/GTL.xcodeproj">
+   </FileRef>
+   <FileRef
       location = "group:Pods/Pods.xcodeproj">
    </FileRef>
 </Workspace>

compileVLCforiOS.sh

@@ -12,7 +12,7 @@ CONFIGURATION="Release"
 NONETWORK=no
 SKIPLIBVLCCOMPILATION=no
 
-TESTEDVLCKITHASH=dcd42c6f
+TESTEDVLCKITHASH=6c6d6863
 TESTEDMEDIALIBRARYKITHASH=e5ca039f
 
 usage()
@@ -146,9 +146,6 @@ info "Preparing build dirs"
 
 mkdir -p ImportedSources
 
-rm -rf External
-mkdir -p External
-
 spushd ImportedSources
 
 if [ "$NONETWORK" != "yes" ]; then
@@ -213,25 +210,8 @@ cd OneDrive && git pull --rebase && cd ..
 fi
 fi
 
-info "Setup 'External' folders"
-
-if [ "$PLATFORM" = "iphonesimulator" ]; then
-    xcbuilddir="build/${CONFIGURATION}-iphonesimulator"
-else
-    xcbuilddir="build/${CONFIGURATION}-iphoneos"
-fi
-framework_build="${aspen_root_dir}/ImportedSources/VLCKit/${xcbuilddir}"
-mlkit_build="${aspen_root_dir}/ImportedSources/MediaLibraryKit/${xcbuilddir}"
-gtl_build="${aspen_root_dir}/ImportedSources/GDrive/${xcbuilddir}"
-onedrive_build="${aspen_root_dir}/ImportedSources/OneDrive/src/${xcbuilddir}"
-
 spopd #ImportedSources
 
-ln -sf ${framework_build} External/MobileVLCKit
-ln -sf ${mlkit_build} External/MediaLibraryKit
-ln -sf ${gtl_build} External/gtl
-ln -sf ${onedrive_build} External/OneDrive
-
 #
 # Build time
 #
@@ -256,22 +236,6 @@ if [ "$SKIPLIBVLCCOMPILATION" = "yes" ]; then
     args="${args} -l"
 fi
 ./buildMobileVLCKit.sh ${args} -k "${SDK}"
-buildxcodeproj MobileVLCKit "Aggregate static plugins"
-buildxcodeproj MobileVLCKit "MobileVLCKit"
-spopd
-
-spushd MediaLibraryKit
-rm -f External/MobileVLCKit
-ln -sf ${framework_build} External/MobileVLCKit
-buildxcodeproj MediaLibraryKit
-spopd
-
-spushd GDrive
-buildxcodeproj GTL "GTLTouchStaticLib"
-spopd
-
-spushd OneDrive/src
-buildxcodeproj LiveSDK "LiveSDK"
 spopd
 
 spopd # ImportedSources

patches/onedrive/0003-fix-archs.patch

@@ -0,0 +1,48 @@
+From b963dc19b26ee6e7b75a6774a8fe9cd74d224b38 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
+Date: Fri, 10 Jul 2015 18:48:10 +0200
+Subject: [PATCH] fix archs
+
+---
+ src/LiveSDK.xcodeproj/project.pbxproj | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/LiveSDK.xcodeproj/project.pbxproj b/src/LiveSDK.xcodeproj/project.pbxproj
+index fd45f68..48db850 100755
+--- a/src/LiveSDK.xcodeproj/project.pbxproj
++++ b/src/LiveSDK.xcodeproj/project.pbxproj
+@@ -508,8 +508,8 @@
+ 			projectDirPath = "";
+ 			projectRoot = "";
+ 			targets = (
+-				5297DDF3145E102B005B463E /* LiveSDKTests */,
+ 				5285182D14727FE6009E8BD6 /* LiveSDK */,
++				5297DDF3145E102B005B463E /* LiveSDKTests */,
+ 			);
+ 		};
+ /* End PBXProject section */
+@@ -642,6 +642,10 @@
+ 		5285183814727FE7009E8BD6 /* Debug */ = {
+ 			isa = XCBuildConfiguration;
+ 			buildSettings = {
++				ARCHS = (
++					"$(ARCHS_STANDARD)",
++					armv7s,
++				);
+ 				DEAD_CODE_STRIPPING = NO;
+ 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+ 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+@@ -664,6 +668,10 @@
+ 		5285183914727FE7009E8BD6 /* Release */ = {
+ 			isa = XCBuildConfiguration;
+ 			buildSettings = {
++				ARCHS = (
++					"$(ARCHS_STANDARD)",
++					armv7s,
++				);
+ 				DEAD_CODE_STRIPPING = NO;
+ 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+-- 
+2.4.4
+