diff --git a/CGame.xcworkspace/contents.xcworkspacedata b/CGame.xcworkspace/contents.xcworkspacedata index 7eb96a29..8ff3c79e 100644 --- a/CGame.xcworkspace/contents.xcworkspacedata +++ b/CGame.xcworkspace/contents.xcworkspacedata @@ -5,10 +5,10 @@ location = "group:/Users/aaa/Documents/IOS/GBA/603/GBA005/CGame.xcodeproj"> + location = "group:/Users/aaa/Documents/IOS/GBA/603/GBA005/Cores/DeltaCore/CGameCore.xcodeproj"> + location = "group:/Users/aaa/Documents/IOS/GBA/603/GBA005/Cores/GBADeltaCore/GBACore.xcodeproj"> diff --git a/CGame.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate b/CGame.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate index 8ac3f6ed..08d8d8a1 100644 Binary files a/CGame.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate and b/CGame.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Cores/DeltaCore/DeltaCore.xcodeproj/project.pbxproj b/Cores/DeltaCore/CGameCore.xcodeproj/project.pbxproj similarity index 98% rename from Cores/DeltaCore/DeltaCore.xcodeproj/project.pbxproj rename to Cores/DeltaCore/CGameCore.xcodeproj/project.pbxproj index 0c075284..1d2e6526 100644 --- a/Cores/DeltaCore/DeltaCore.xcodeproj/project.pbxproj +++ b/Cores/DeltaCore/CGameCore.xcodeproj/project.pbxproj @@ -115,7 +115,7 @@ BF425A7D1D23B15800F48ED9 /* DeltaCoreProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DeltaCoreProtocol.swift; sourceTree = ""; }; BF425A941D23BD8500F48ED9 /* EmulatorBridging.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EmulatorBridging.swift; sourceTree = ""; }; BF46348E20D882F900CD12FD /* ControllerInputView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ControllerInputView.swift; sourceTree = ""; }; - BF46895D1AACF36800A2586D /* DeltaCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = DeltaCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + BF46895D1AACF36800A2586D /* CGameCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CGameCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; BF4689611AACF36800A2586D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; BF4689621AACF36800A2586D /* DeltaCore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeltaCore.h; sourceTree = ""; }; BF4689811AAD703500A2586D /* GameProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameProtocol.swift; sourceTree = ""; }; @@ -249,7 +249,7 @@ BF46895E1AACF36800A2586D /* Products */ = { isa = PBXGroup; children = ( - BF46895D1AACF36800A2586D /* DeltaCore.framework */, + BF46895D1AACF36800A2586D /* CGameCore.framework */, ); name = Products; sourceTree = ""; @@ -473,9 +473,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - BF46895C1AACF36800A2586D /* DeltaCore */ = { + BF46895C1AACF36800A2586D /* CGameCore */ = { isa = PBXNativeTarget; - buildConfigurationList = BF4689731AACF36800A2586D /* Build configuration list for PBXNativeTarget "DeltaCore" */; + buildConfigurationList = BF4689731AACF36800A2586D /* Build configuration list for PBXNativeTarget "CGameCore" */; buildPhases = ( BF4689581AACF36800A2586D /* Sources */, BF4689591AACF36800A2586D /* Frameworks */, @@ -487,9 +487,9 @@ dependencies = ( BFA07F07221F3A070012699D /* PBXTargetDependency */, ); - name = DeltaCore; + name = CGameCore; productName = DeltaCore; - productReference = BF46895D1AACF36800A2586D /* DeltaCore.framework */; + productReference = BF46895D1AACF36800A2586D /* CGameCore.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -508,7 +508,7 @@ }; }; }; - buildConfigurationList = BF4689571AACF36800A2586D /* Build configuration list for PBXProject "DeltaCore" */; + buildConfigurationList = BF4689571AACF36800A2586D /* Build configuration list for PBXProject "CGameCore" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -528,7 +528,7 @@ ); projectRoot = ""; targets = ( - BF46895C1AACF36800A2586D /* DeltaCore */, + BF46895C1AACF36800A2586D /* CGameCore */, ); }; /* End PBXProject section */ @@ -774,6 +774,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies"; PRODUCT_BUNDLE_IDENTIFIER = "com.rileytestut.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = CGameCore; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = FRAMEWORK; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -795,6 +796,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies"; PRODUCT_BUNDLE_IDENTIFIER = "com.rileytestut.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = CGameCore; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = FRAMEWORK; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -805,7 +807,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - BF4689571AACF36800A2586D /* Build configuration list for PBXProject "DeltaCore" */ = { + BF4689571AACF36800A2586D /* Build configuration list for PBXProject "CGameCore" */ = { isa = XCConfigurationList; buildConfigurations = ( BF4689711AACF36800A2586D /* Debug */, @@ -814,7 +816,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - BF4689731AACF36800A2586D /* Build configuration list for PBXNativeTarget "DeltaCore" */ = { + BF4689731AACF36800A2586D /* Build configuration list for PBXNativeTarget "CGameCore" */ = { isa = XCConfigurationList; buildConfigurations = ( BF4689741AACF36800A2586D /* Debug */, diff --git a/Cores/DeltaCore/DeltaCore.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Cores/DeltaCore/CGameCore.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from Cores/DeltaCore/DeltaCore.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to Cores/DeltaCore/CGameCore.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/Cores/DeltaCore/DeltaCore.xcodeproj/project.xcworkspace/xcshareddata/DeltaCore.xcscmblueprint b/Cores/DeltaCore/CGameCore.xcodeproj/project.xcworkspace/xcshareddata/DeltaCore.xcscmblueprint similarity index 100% rename from Cores/DeltaCore/DeltaCore.xcodeproj/project.xcworkspace/xcshareddata/DeltaCore.xcscmblueprint rename to Cores/DeltaCore/CGameCore.xcodeproj/project.xcworkspace/xcshareddata/DeltaCore.xcscmblueprint diff --git a/Cores/DeltaCore/DeltaCore.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Cores/DeltaCore/CGameCore.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from Cores/DeltaCore/DeltaCore.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to Cores/DeltaCore/CGameCore.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Cores/DeltaCore/DeltaCore.xcodeproj/project.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate b/Cores/DeltaCore/CGameCore.xcodeproj/project.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate similarity index 100% rename from Cores/DeltaCore/DeltaCore.xcodeproj/project.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate rename to Cores/DeltaCore/CGameCore.xcodeproj/project.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/Cores/DeltaCore/DeltaCore.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist b/Cores/DeltaCore/CGameCore.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 100% rename from Cores/DeltaCore/DeltaCore.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist rename to Cores/DeltaCore/CGameCore.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/Cores/GBADeltaCore/GBADeltaCore.xcodeproj/project.pbxproj b/Cores/GBADeltaCore/GBACore.xcodeproj/project.pbxproj similarity index 99% rename from Cores/GBADeltaCore/GBADeltaCore.xcodeproj/project.pbxproj rename to Cores/GBADeltaCore/GBACore.xcodeproj/project.pbxproj index b6b4bdae..f8cafdc7 100644 --- a/Cores/GBADeltaCore/GBADeltaCore.xcodeproj/project.pbxproj +++ b/Cores/GBADeltaCore/GBACore.xcodeproj/project.pbxproj @@ -558,7 +558,7 @@ BF917D2322261A9B00901726 /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; }; BFD5EB0E1D304D21001487DC /* GBATypes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GBATypes.m; sourceTree = ""; }; BFD5EB221D305B48001487DC /* Standard.deltaskin */ = {isa = PBXFileReference; lastKnownFileType = file; name = Standard.deltaskin; path = "Controller Skin/Standard.deltaskin"; sourceTree = ""; }; - BFE8E9CA1D010AF7009D623D /* GBADeltaCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GBADeltaCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + BFE8E9CA1D010AF7009D623D /* GBACore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GBACore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; BFE8E9CD1D010AF7009D623D /* GBADeltaCore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GBADeltaCore.h; sourceTree = ""; }; BFE8E9CF1D010AF7009D623D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ @@ -1112,7 +1112,7 @@ BFE8E9CB1D010AF7009D623D /* Products */ = { isa = PBXGroup; children = ( - BFE8E9CA1D010AF7009D623D /* GBADeltaCore.framework */, + BFE8E9CA1D010AF7009D623D /* GBACore.framework */, BF287FF21EB590F90027FC53 /* libVBA-M.a */, ); name = Products; @@ -1276,9 +1276,9 @@ productReference = BF287FF21EB590F90027FC53 /* libVBA-M.a */; productType = "com.apple.product-type.library.static"; }; - BFE8E9C91D010AF7009D623D /* GBADeltaCore */ = { + BFE8E9C91D010AF7009D623D /* GBACore */ = { isa = PBXNativeTarget; - buildConfigurationList = BFE8E9D21D010AF7009D623D /* Build configuration list for PBXNativeTarget "GBADeltaCore" */; + buildConfigurationList = BFE8E9D21D010AF7009D623D /* Build configuration list for PBXNativeTarget "GBACore" */; buildPhases = ( BFE8E9C51D010AF7009D623D /* Sources */, BFE8E9C61D010AF7009D623D /* Frameworks */, @@ -1290,9 +1290,9 @@ dependencies = ( BF2881021EB5962B0027FC53 /* PBXTargetDependency */, ); - name = GBADeltaCore; + name = GBACore; productName = GBADeltaCore; - productReference = BFE8E9CA1D010AF7009D623D /* GBADeltaCore.framework */; + productReference = BFE8E9CA1D010AF7009D623D /* GBACore.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -1315,7 +1315,7 @@ }; }; }; - buildConfigurationList = BFE8E9C41D010AF7009D623D /* Build configuration list for PBXProject "GBADeltaCore" */; + buildConfigurationList = BFE8E9C41D010AF7009D623D /* Build configuration list for PBXProject "GBACore" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -1329,7 +1329,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - BFE8E9C91D010AF7009D623D /* GBADeltaCore */, + BFE8E9C91D010AF7009D623D /* GBACore */, BF287FF11EB590F90027FC53 /* libVBA-M */, ); }; @@ -1705,7 +1705,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - BFE8E9C41D010AF7009D623D /* Build configuration list for PBXProject "GBADeltaCore" */ = { + BFE8E9C41D010AF7009D623D /* Build configuration list for PBXProject "GBACore" */ = { isa = XCConfigurationList; buildConfigurations = ( BFE8E9D01D010AF7009D623D /* Debug */, @@ -1714,7 +1714,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - BFE8E9D21D010AF7009D623D /* Build configuration list for PBXNativeTarget "GBADeltaCore" */ = { + BFE8E9D21D010AF7009D623D /* Build configuration list for PBXNativeTarget "GBACore" */ = { isa = XCConfigurationList; buildConfigurations = ( BFE8E9D31D010AF7009D623D /* Debug */, diff --git a/Cores/GBADeltaCore/GBADeltaCore.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Cores/GBADeltaCore/GBACore.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from Cores/GBADeltaCore/GBADeltaCore.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to Cores/GBADeltaCore/GBACore.xcodeproj/project.xcworkspace/contents.xcworkspacedata