diff --git a/.gitmodules b/.gitmodules index 0d63849..e12ec55 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "Cores/DeltaCore"] path = Cores/DeltaCore url = git@github.com:rileytestut/DeltaCore.git +[submodule "Cores/SNESDeltaCore"] + path = Cores/SNESDeltaCore + url = git@github.com:rileytestut/SNESDeltaCore.git diff --git a/Cores/DeltaCore b/Cores/DeltaCore index b8398a5..da94192 160000 --- a/Cores/DeltaCore +++ b/Cores/DeltaCore @@ -1 +1 @@ -Subproject commit b8398a50386bfa1291f584391de491175bdd7515 +Subproject commit da94192b5544a99aac358db0c869381bf6ece8f9 diff --git a/Cores/SNESDeltaCore b/Cores/SNESDeltaCore new file mode 160000 index 0000000..c57b210 --- /dev/null +++ b/Cores/SNESDeltaCore @@ -0,0 +1 @@ +Subproject commit c57b21077f13c1acbe8112f36ec48e1cb56e5619 diff --git a/Delta.xcodeproj/project.pbxproj b/Delta.xcodeproj/project.pbxproj index 17b347e..3447082 100644 --- a/Delta.xcodeproj/project.pbxproj +++ b/Delta.xcodeproj/project.pbxproj @@ -10,6 +10,8 @@ BF46894F1AAC46EF00A2586D /* DirectoryContentsDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF46894E1AAC46EF00A2586D /* DirectoryContentsDataSource.swift */; }; 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, ); }; }; + BFC134E11AAD82460087AD7B /* SNESDeltaCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BFC134E01AAD82460087AD7B /* SNESDeltaCore.framework */; }; + BFC134E21AAD82470087AD7B /* SNESDeltaCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BFC134E01AAD82460087AD7B /* SNESDeltaCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; BFFA71DD1AAC406100EE9DD1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFFA71DC1AAC406100EE9DD1 /* AppDelegate.swift */; }; BFFA71DF1AAC406100EE9DD1 /* GamesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFFA71DE1AAC406100EE9DD1 /* GamesViewController.swift */; }; BFFA71E21AAC406100EE9DD1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BFFA71E01AAC406100EE9DD1 /* Main.storyboard */; }; @@ -25,6 +27,7 @@ dstSubfolderSpec = 10; files = ( BF9F4FD01AAD7B87004C9500 /* DeltaCore.framework in Embed Frameworks */, + BFC134E21AAD82470087AD7B /* SNESDeltaCore.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -34,6 +37,7 @@ /* Begin PBXFileReference section */ BF46894E1AAC46EF00A2586D /* DirectoryContentsDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DirectoryContentsDataSource.swift; sourceTree = ""; }; BF9F4FCE1AAD7B87004C9500 /* DeltaCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = DeltaCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + BFC134E01AAD82460087AD7B /* SNESDeltaCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SNESDeltaCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; BFFA71D71AAC406100EE9DD1 /* Delta.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Delta.app; sourceTree = BUILT_PRODUCTS_DIR; }; BFFA71DB1AAC406100EE9DD1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; BFFA71DC1AAC406100EE9DD1 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -49,6 +53,7 @@ buildActionMask = 2147483647; files = ( BF9F4FCF1AAD7B87004C9500 /* DeltaCore.framework in Frameworks */, + BFC134E11AAD82460087AD7B /* SNESDeltaCore.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -68,6 +73,7 @@ isa = PBXGroup; children = ( BF9F4FCE1AAD7B87004C9500 /* DeltaCore.framework */, + BFC134E01AAD82460087AD7B /* SNESDeltaCore.framework */, ); name = Frameworks; sourceTree = ""; @@ -295,6 +301,10 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/Delta-cubiloonxwcpqtawcqdjabbtttfl/Build/Products/Debug-iphoneos", + ); INFOPLIST_FILE = Delta/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -306,6 +316,10 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/Delta-cubiloonxwcpqtawcqdjabbtttfl/Build/Products/Debug-iphoneos", + ); INFOPLIST_FILE = Delta/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; diff --git a/Delta.xcworkspace/contents.xcworkspacedata b/Delta.xcworkspace/contents.xcworkspacedata index 339ebcf..01a914e 100644 --- a/Delta.xcworkspace/contents.xcworkspacedata +++ b/Delta.xcworkspace/contents.xcworkspacedata @@ -7,4 +7,7 @@ + + diff --git a/Delta/GamesViewController.swift b/Delta/GamesViewController.swift index cd6efcf..e4142de 100644 --- a/Delta/GamesViewController.swift +++ b/Delta/GamesViewController.swift @@ -75,7 +75,7 @@ class GamesViewController: UITableViewController override func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) { - if let URL = self.directoryContentsDataSource?.URLAtIndexPath(indexPath), game = Game.gameWithURL(URL) + if let URL = self.directoryContentsDataSource?.URLAtIndexPath(indexPath), game = Game.gameWithURL(URL) where !(game.isMemberOfClass(Game.self)) { println(game.name) } @@ -85,6 +85,8 @@ class GamesViewController: UITableViewController alertController.addAction(UIAlertAction(title: "OK", style: UIAlertActionStyle.Cancel, handler: nil)) self.presentViewController(alertController, animated: true, completion: nil) + + self.tableView.deselectRowAtIndexPath(indexPath, animated: true) } } } diff --git a/Delta/Info.plist b/Delta/Info.plist index 7aee21b..16a7f51 100644 --- a/Delta/Info.plist +++ b/Delta/Info.plist @@ -36,5 +36,54 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + CFBundleDocumentTypes + + + CFBundleTypeName + SNES Game + CFBundleTypeRole + Viewer + LSHandlerRank + Owner + LSItemContentTypes + + com.rileytestut.delta.game.SNES + + + + UTExportedTypeDeclarations + + + UTTypeConformsTo + + public.data + public.content + + UTTypeDescription + Delta Game + UTTypeIdentifier + com.rileytestut.delta.game + UTTypeTagSpecification + + public.filename-extension + SNES + + + + UTTypeConformsTo + + com.rileytestut.delta.game + + UTTypeDescription + SNES Game + UTTypeIdentifier + com.rileytestut.delta.game.SNES + UTTypeTagSpecification + + public.filename-extension + smc + + +