Commit 574e98a8 authored by Felix Paul Kühne's avatar Felix Paul Kühne

Update MVK adding support for VideoToolbox

parent da3781e4
# Uncomment this line to define a global platform for your project
# platform :ios, '6.0'
platform :ios, '7.0'
source 'https://github.com/CocoaPods/Specs.git'
......@@ -21,5 +20,6 @@ post_install do |installer_representation|
config.build_settings['SKIP_INSTALL'] = 'YES'
config.build_settings['VALID_ARCHS'] = 'armv7 armv7s arm64'
config.build_settings['ARCHS'] = 'armv7 armv7s arm64'
config.build_settings['CLANG_CXX_LIBRARY'] = 'libc++'
end
end
......@@ -138,6 +138,9 @@
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 */; };
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 */; };
......@@ -566,6 +569,8 @@
7D8139C31865206200D65504 /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fa; path = fa.lproj/Localizable.strings; sourceTree = "<group>"; };
7D8139C8186520A800D65504 /* es-MX */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-MX"; path = "es-MX.lproj/Localizable.strings"; sourceTree = "<group>"; };
7D8139CD1865211900D65504 /* ms */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ms; path = ms.lproj/Localizable.strings; sourceTree = "<group>"; };
7D84E4C51B41AB2800EA7D1F /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
7D84E4C81B41ABCE00EA7D1F /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
7D871F4F1AD7257100348D27 /* UIImage+Scaling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIImage+Scaling.h"; path = "Sources/UIImage+Scaling.h"; sourceTree = SOURCE_ROOT; };
7D871F501AD7257100348D27 /* UIImage+Scaling.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIImage+Scaling.m"; path = "Sources/UIImage+Scaling.m"; sourceTree = SOURCE_ROOT; };
7D89786E185DED88009BAB5D /* VLCDownloadViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCDownloadViewController.xib; path = Resources/VLCDownloadViewController.xib; sourceTree = SOURCE_ROOT; };
......@@ -728,6 +733,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
7D84E4C71B41AB6E00EA7D1F /* VideoToolbox.framework in Frameworks */,
DDF157B51ACB16E500AAFBC6 /* AudioToolbox.framework in Frameworks */,
DDF157B41ACB169B00AAFBC6 /* WatchKit.framework in Frameworks */,
DDF157B21ACB169600AAFBC6 /* CoreData.framework in Frameworks */,
......@@ -746,6 +752,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
7D84E4C91B41ABCE00EA7D1F /* CoreMedia.framework in Frameworks */,
7D84E4C61B41AB2800EA7D1F /* VideoToolbox.framework in Frameworks */,
7D298F441AD5827E00A0BF68 /* WatchKit.framework in Frameworks */,
8F91EC7F195E1DAB00F5BCBA /* AssetsLibrary.framework in Frameworks */,
7D15168B194773630086FB8C /* MobileCoreServices.framework in Frameworks */,
......@@ -1250,6 +1258,8 @@
7D94FCDD16DE7D1000F2623B /* Frameworks */ = {
isa = PBXGroup;
children = (
7D84E4C81B41ABCE00EA7D1F /* CoreMedia.framework */,
7D84E4C51B41AB2800EA7D1F /* VideoToolbox.framework */,
7D7B17EC1AD8052A003BF3D7 /* libc++.dylib */,
7D7B17ED1AD8052B003BF3D7 /* libz.dylib */,
DDF157B31ACB169B00AAFBC6 /* WatchKit.framework */,
......
......@@ -12,7 +12,7 @@ CONFIGURATION="Release"
NONETWORK=no
SKIPLIBVLCCOMPILATION=no
TESTEDVLCKITHASH=e39453a6
TESTEDVLCKITHASH=dcd42c6f
TESTEDMEDIALIBRARYKITHASH=ee79bd9d
usage()
......
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