From a1ae5679bbe9b051232cd31c12c1934e3fb375ed Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Tue, 10 Mar 2015 00:14:03 -0700 Subject: [PATCH] Added Roxas submodule --- .gitmodules | 3 +++ Delta.xcodeproj/project.pbxproj | 20 +++++++++++++++++--- Delta.xcworkspace/contents.xcworkspacedata | 3 +++ External/Roxas | 1 + 4 files changed, 24 insertions(+), 3 deletions(-) create mode 160000 External/Roxas diff --git a/.gitmodules b/.gitmodules index e12ec55..c305b38 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "Cores/SNESDeltaCore"] path = Cores/SNESDeltaCore url = git@github.com:rileytestut/SNESDeltaCore.git +[submodule "External/Roxas"] + path = External/Roxas + url = git@github.com:rileytestut/Roxas.git diff --git a/Delta.xcodeproj/project.pbxproj b/Delta.xcodeproj/project.pbxproj index 3447082..874484f 100644 --- a/Delta.xcodeproj/project.pbxproj +++ b/Delta.xcodeproj/project.pbxproj @@ -12,6 +12,8 @@ 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, ); }; }; + BFEC732D1AAECC4A00650035 /* Roxas.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BFEC732C1AAECC4A00650035 /* Roxas.framework */; }; + BFEC732E1AAECC4A00650035 /* Roxas.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BFEC732C1AAECC4A00650035 /* Roxas.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 */; }; @@ -27,6 +29,7 @@ dstSubfolderSpec = 10; files = ( BF9F4FD01AAD7B87004C9500 /* DeltaCore.framework in Embed Frameworks */, + BFEC732E1AAECC4A00650035 /* Roxas.framework in Embed Frameworks */, BFC134E21AAD82470087AD7B /* SNESDeltaCore.framework in Embed Frameworks */, ); name = "Embed Frameworks"; @@ -38,6 +41,7 @@ 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; }; + BFEC732C1AAECC4A00650035 /* Roxas.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Roxas.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 = ""; }; @@ -53,6 +57,7 @@ buildActionMask = 2147483647; files = ( BF9F4FCF1AAD7B87004C9500 /* DeltaCore.framework in Frameworks */, + BFEC732D1AAECC4A00650035 /* Roxas.framework in Frameworks */, BFC134E11AAD82460087AD7B /* SNESDeltaCore.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -72,12 +77,21 @@ BF9F4FCD1AAD7B25004C9500 /* Frameworks */ = { isa = PBXGroup; children = ( + BFEC732C1AAECC4A00650035 /* Roxas.framework */, BF9F4FCE1AAD7B87004C9500 /* DeltaCore.framework */, BFC134E01AAD82460087AD7B /* SNESDeltaCore.framework */, ); name = Frameworks; sourceTree = ""; }; + BFEC732F1AAECCBD00650035 /* Resources */ = { + isa = PBXGroup; + children = ( + BFFA71E31AAC406100EE9DD1 /* Images.xcassets */, + ); + name = Resources; + sourceTree = ""; + }; BFFA71CE1AAC406100EE9DD1 = { isa = PBXGroup; children = ( @@ -99,10 +113,9 @@ isa = PBXGroup; children = ( BFFA71DC1AAC406100EE9DD1 /* AppDelegate.swift */, - BF46894D1AAC469800A2586D /* Game Selection */, BFFA71E01AAC406100EE9DD1 /* Main.storyboard */, - BFFA71E31AAC406100EE9DD1 /* Images.xcassets */, - BFFA71E51AAC406100EE9DD1 /* LaunchScreen.xib */, + BF46894D1AAC469800A2586D /* Game Selection */, + BFEC732F1AAECCBD00650035 /* Resources */, BFFA71DA1AAC406100EE9DD1 /* Supporting Files */, ); path = Delta; @@ -111,6 +124,7 @@ BFFA71DA1AAC406100EE9DD1 /* Supporting Files */ = { isa = PBXGroup; children = ( + BFFA71E51AAC406100EE9DD1 /* LaunchScreen.xib */, BFFA71DB1AAC406100EE9DD1 /* Info.plist */, ); name = "Supporting Files"; diff --git a/Delta.xcworkspace/contents.xcworkspacedata b/Delta.xcworkspace/contents.xcworkspacedata index 01a914e..031ab90 100644 --- a/Delta.xcworkspace/contents.xcworkspacedata +++ b/Delta.xcworkspace/contents.xcworkspacedata @@ -10,4 +10,7 @@ + + diff --git a/External/Roxas b/External/Roxas new file mode 160000 index 0000000..f58b2ea --- /dev/null +++ b/External/Roxas @@ -0,0 +1 @@ +Subproject commit f58b2ea50683f13d20f486486b41307267ddd7ac