From af631870d4aa6576f2ccced3a7c355ec314132ad Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Sat, 26 Sep 2015 15:14:46 -0700 Subject: [PATCH] Updated DeltaTV to use tvOS framework dependencies --- Cores/DeltaCore | 2 +- Cores/SNESDeltaCore | 2 +- Delta.xcodeproj/project.pbxproj | 34 +++++++++++++++++++++++++++++++++ External/Roxas | 2 +- 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/Cores/DeltaCore b/Cores/DeltaCore index bf1cc72..4539229 160000 --- a/Cores/DeltaCore +++ b/Cores/DeltaCore @@ -1 +1 @@ -Subproject commit bf1cc72947630daf9c15615cc98c1a90ed91f3ee +Subproject commit 453922921884966df4aea1fc1dba7e3a15de9aa1 diff --git a/Cores/SNESDeltaCore b/Cores/SNESDeltaCore index 288f6ac..5336f18 160000 --- a/Cores/SNESDeltaCore +++ b/Cores/SNESDeltaCore @@ -1 +1 @@ -Subproject commit 288f6ac21bbca3a2fda293eb9af962a4c5dd3b80 +Subproject commit 5336f186d784d956e1bef24e3091e2b2b79abd21 diff --git a/Delta.xcodeproj/project.pbxproj b/Delta.xcodeproj/project.pbxproj index 3108a2b..1f9a545 100644 --- a/Delta.xcodeproj/project.pbxproj +++ b/Delta.xcodeproj/project.pbxproj @@ -8,6 +8,10 @@ /* Begin PBXBuildFile section */ BF090CF41B490D8300DCAB45 /* UIDevice+Vibration.m in Sources */ = {isa = PBXBuildFile; fileRef = BF090CF31B490D8300DCAB45 /* UIDevice+Vibration.m */; }; + BF2A53FB1BB74FC10052BD0C /* SNESDeltaCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BFC134E01AAD82460087AD7B /* SNESDeltaCore.framework */; }; + BF2A53FC1BB74FC10052BD0C /* SNESDeltaCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BFC134E01AAD82460087AD7B /* SNESDeltaCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + BF2A53FD1BB74FC60052BD0C /* ZipZap.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF70798B1B6B464B0019077C /* ZipZap.framework */; }; + BF2A53FE1BB74FC60052BD0C /* ZipZap.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BF70798B1B6B464B0019077C /* ZipZap.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; BF46894F1AAC46EF00A2586D /* DirectoryContentsDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF46894E1AAC46EF00A2586D /* DirectoryContentsDataSource.swift */; }; BF5E7F441B9A650B00AE44F8 /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5E7F431B9A650B00AE44F8 /* SettingsViewController.swift */; }; BF5E7F461B9A652600AE44F8 /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BF5E7F451B9A652600AE44F8 /* Settings.storyboard */; }; @@ -17,6 +21,10 @@ BF6BB2461BB73FE800CCF94A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BF6BB2451BB73FE800CCF94A /* Assets.xcassets */; }; BF70798C1B6B464B0019077C /* ZipZap.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF70798B1B6B464B0019077C /* ZipZap.framework */; }; BF70798D1B6B464B0019077C /* ZipZap.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BF70798B1B6B464B0019077C /* ZipZap.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + BF8624881BB743FE00C12EEE /* Roxas.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BFEC732C1AAECC4A00650035 /* Roxas.framework */; }; + BF8624891BB743FE00C12EEE /* Roxas.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BFEC732C1AAECC4A00650035 /* Roxas.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + BF8624A91BB7464B00C12EEE /* DeltaCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF9F4FCE1AAD7B87004C9500 /* DeltaCore.framework */; }; + BF8624AA1BB7464B00C12EEE /* DeltaCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BF9F4FCE1AAD7B87004C9500 /* DeltaCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; BF9F4FCF1AAD7B87004C9500 /* DeltaCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF9F4FCE1AAD7B87004C9500 /* DeltaCore.framework */; }; BF9F4FD01AAD7B87004C9500 /* DeltaCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BF9F4FCE1AAD7B87004C9500 /* DeltaCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; BFAA1FED1B8AA4FA00495943 /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFAA1FEC1B8AA4FA00495943 /* Settings.swift */; }; @@ -34,6 +42,20 @@ /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ + BF86248A1BB743FE00C12EEE /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + BF2A53FC1BB74FC10052BD0C /* SNESDeltaCore.framework in Embed Frameworks */, + BF8624AA1BB7464B00C12EEE /* DeltaCore.framework in Embed Frameworks */, + BF2A53FE1BB74FC60052BD0C /* ZipZap.framework in Embed Frameworks */, + BF8624891BB743FE00C12EEE /* Roxas.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; BF9F4FCC1AAD7AEE004C9500 /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -84,6 +106,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + BF2A53FB1BB74FC10052BD0C /* SNESDeltaCore.framework in Frameworks */, + BF8624A91BB7464B00C12EEE /* DeltaCore.framework in Frameworks */, + BF2A53FD1BB74FC60052BD0C /* ZipZap.framework in Frameworks */, + BF8624881BB743FE00C12EEE /* Roxas.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -231,6 +257,7 @@ BF6BB2381BB73FE800CCF94A /* Sources */, BF6BB2391BB73FE800CCF94A /* Frameworks */, BF6BB23A1BB73FE800CCF94A /* Resources */, + BF86248A1BB743FE00C12EEE /* Embed Frameworks */, ); buildRules = ( ); @@ -271,6 +298,7 @@ TargetAttributes = { BF6BB23B1BB73FE800CCF94A = { CreatedOnToolsVersion = 7.1; + DevelopmentTeam = 6XVY5G3U44; }; BFFA71D61AAC406100EE9DD1 = { CreatedOnToolsVersion = 6.3; @@ -383,8 +411,11 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = "iPhone Developer"; INFOPLIST_FILE = "DeltaTV/Supporting Files/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PROVISIONING_PROFILE = ""; SDKROOT = appletvos; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; @@ -396,8 +427,11 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = "iPhone Developer"; INFOPLIST_FILE = "DeltaTV/Supporting Files/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PROVISIONING_PROFILE = ""; SDKROOT = appletvos; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; diff --git a/External/Roxas b/External/Roxas index 43b0ef2..9789612 160000 --- a/External/Roxas +++ b/External/Roxas @@ -1 +1 @@ -Subproject commit 43b0ef22a303ac87d54fd89069b372be77fb4bc5 +Subproject commit 9789612ecbdfd17a8c94b52f4872ec70d44cc4aa