diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj index 521b3f7b5..82820b2c6 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj +++ b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj @@ -160,6 +160,7 @@ 4B228CD924DA12C60077EF25 /* CSScanTargetView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B228CD824DA12C60077EF25 /* CSScanTargetView.m */; }; 4B228CDB24DA41890077EF25 /* ScanTarget.metal in Sources */ = {isa = PBXBuildFile; fileRef = 4B228CDA24DA41880077EF25 /* ScanTarget.metal */; }; 4B2530F4244E6774007980BF /* fm.json in Resources */ = {isa = PBXBuildFile; fileRef = 4B2530F3244E6773007980BF /* fm.json */; }; + 4B25B5F925BD083C00362C84 /* DiskIIDrive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B80CD6D2568A82600176FCC /* DiskIIDrive.cpp */; }; 4B2A332D1DB86821002876E3 /* OricOptions.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B2A332B1DB86821002876E3 /* OricOptions.xib */; }; 4B2A539F1D117D36003C6002 /* CSAudioQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B2A53911D117D36003C6002 /* CSAudioQueue.m */; }; 4B2B3A4B1F9B8FA70062DABF /* Typer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B2B3A471F9B8FA70062DABF /* Typer.cpp */; }; @@ -832,7 +833,6 @@ 4BB73EA91B587A5100552FC2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4BB73EA81B587A5100552FC2 /* Assets.xcassets */; }; 4BB73EAC1B587A5100552FC2 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BB73EAA1B587A5100552FC2 /* MainMenu.xib */; }; 4BB73EB71B587A5100552FC2 /* AllSuiteATests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB73EB61B587A5100552FC2 /* AllSuiteATests.swift */; }; - 4BB73EC21B587A5100552FC2 /* Clock_SignalUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB73EC11B587A5100552FC2 /* Clock_SignalUITests.swift */; }; 4BB8616E24E22DC500A00E03 /* BufferingScanTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BB8616D24E22DC500A00E03 /* BufferingScanTarget.cpp */; }; 4BB8616F24E22DC500A00E03 /* BufferingScanTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BB8616D24E22DC500A00E03 /* BufferingScanTarget.cpp */; }; 4BB8617124E22F5700A00E03 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BB8617024E22F4900A00E03 /* Accelerate.framework */; }; @@ -966,13 +966,6 @@ remoteGlobalIDString = 4BB73E9D1B587A5100552FC2; remoteInfo = "Clock Signal"; }; - 4BB73EBE1B587A5100552FC2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4BB73E961B587A5100552FC2 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 4BB73E9D1B587A5100552FC2; - remoteInfo = "Clock Signal"; - }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -1792,7 +1785,6 @@ 4BB73EB21B587A5100552FC2 /* Clock SignalTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Clock SignalTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 4BB73EB61B587A5100552FC2 /* AllSuiteATests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllSuiteATests.swift; sourceTree = ""; }; 4BB73EB81B587A5100552FC2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 4BB73EBD1B587A5100552FC2 /* Clock SignalUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Clock SignalUITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 4BB73EC11B587A5100552FC2 /* Clock_SignalUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Clock_SignalUITests.swift; sourceTree = ""; }; 4BB73EC31B587A5100552FC2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 4BB73ECF1B587A6700552FC2 /* Clock Signal.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Clock Signal.entitlements"; sourceTree = ""; }; @@ -2018,13 +2010,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 4BB73EBA1B587A5100552FC2 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -3828,7 +3813,6 @@ children = ( 4BB73E9E1B587A5100552FC2 /* Clock Signal.app */, 4BB73EB21B587A5100552FC2 /* Clock SignalTests.xctest */, - 4BB73EBD1B587A5100552FC2 /* Clock SignalUITests.xctest */, 4B055A6A1FAE763F0060FFFF /* Clock Signal Kiosk */, ); name = Products; @@ -4552,24 +4536,6 @@ productReference = 4BB73EB21B587A5100552FC2 /* Clock SignalTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 4BB73EBC1B587A5100552FC2 /* Clock SignalUITests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4BB73ECC1B587A5100552FC2 /* Build configuration list for PBXNativeTarget "Clock SignalUITests" */; - buildPhases = ( - 4BB73EB91B587A5100552FC2 /* Sources */, - 4BB73EBA1B587A5100552FC2 /* Frameworks */, - 4BB73EBB1B587A5100552FC2 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 4BB73EBF1B587A5100552FC2 /* PBXTargetDependency */, - ); - name = "Clock SignalUITests"; - productName = "Clock SignalUITests"; - productReference = 4BB73EBD1B587A5100552FC2 /* Clock SignalUITests.xctest */; - productType = "com.apple.product-type.bundle.ui-testing"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -4582,7 +4548,7 @@ TargetAttributes = { 4B055A691FAE763F0060FFFF = { CreatedOnToolsVersion = 9.1; - DevelopmentTeam = CP2SKEB3XT; + DevelopmentTeam = DV3346VVUN; ProvisioningStyle = Automatic; }; 4BB73E9D1B587A5100552FC2 = { @@ -4603,12 +4569,6 @@ ProvisioningStyle = Automatic; TestTargetID = 4BB73E9D1B587A5100552FC2; }; - 4BB73EBC1B587A5100552FC2 = { - CreatedOnToolsVersion = 7.0; - DevelopmentTeam = CP2SKEB3XT; - LastSwiftMigration = 1020; - TestTargetID = 4BB73E9D1B587A5100552FC2; - }; }; }; buildConfigurationList = 4BB73E991B587A5100552FC2 /* Build configuration list for PBXProject "Clock Signal" */; @@ -4626,7 +4586,6 @@ targets = ( 4BB73E9D1B587A5100552FC2 /* Clock Signal */, 4BB73EB11B587A5100552FC2 /* Clock SignalTests */, - 4BB73EBC1B587A5100552FC2 /* Clock SignalUITests */, 4B055A691FAE763F0060FFFF /* Clock Signal Kiosk */, ); }; @@ -5006,13 +4965,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 4BB73EBB1B587A5100552FC2 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -5130,6 +5082,7 @@ 4B055ABC1FAE86170060FFFF /* ZX8081.cpp in Sources */, 4B055AC91FAE9AFB0060FFFF /* Keyboard.cpp in Sources */, 4B055A991FAE85CB0060FFFF /* DiskController.cpp in Sources */, + 4B25B5F925BD083C00362C84 /* DiskIIDrive.cpp in Sources */, 4B055ACC1FAE9B030060FFFF /* Electron.cpp in Sources */, 4B74CF822312FA9C00500CE8 /* HFV.cpp in Sources */, 4B8318B022D3E531006DB630 /* AppleII.cpp in Sources */, @@ -5617,14 +5570,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 4BB73EB91B587A5100552FC2 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4BB73EC21B587A5100552FC2 /* Clock_SignalUITests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -5633,11 +5578,6 @@ target = 4BB73E9D1B587A5100552FC2 /* Clock Signal */; targetProxy = 4BB73EB31B587A5100552FC2 /* PBXContainerItemProxy */; }; - 4BB73EBF1B587A5100552FC2 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 4BB73E9D1B587A5100552FC2 /* Clock Signal */; - targetProxy = 4BB73EBE1B587A5100552FC2 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -5750,7 +5690,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = CP2SKEB3XT; + DEVELOPMENT_TEAM = DV3346VVUN; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(USER_LIBRARY_DIR)/Frameworks", @@ -5771,7 +5711,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = CP2SKEB3XT; + DEVELOPMENT_TEAM = DV3346VVUN; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(USER_LIBRARY_DIR)/Frameworks", @@ -6036,34 +5976,6 @@ }; name = Release; }; - 4BB73ECD1B587A5100552FC2 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - DEVELOPMENT_TEAM = CP2SKEB3XT; - INFOPLIST_FILE = "Clock SignalUITests/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "TH.Clock-SignalUITests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TEST_TARGET_NAME = "Clock Signal"; - USES_XCTRUNNER = YES; - }; - name = Debug; - }; - 4BB73ECE1B587A5100552FC2 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - DEVELOPMENT_TEAM = CP2SKEB3XT; - INFOPLIST_FILE = "Clock SignalUITests/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "TH.Clock-SignalUITests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TEST_TARGET_NAME = "Clock Signal"; - USES_XCTRUNNER = YES; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -6103,15 +6015,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 4BB73ECC1B587A5100552FC2 /* Build configuration list for PBXNativeTarget "Clock SignalUITests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4BB73ECD1B587A5100552FC2 /* Debug */, - 4BB73ECE1B587A5100552FC2 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = 4BB73E961B587A5100552FC2 /* Project object */; diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme index 672c62faf..324ac6bb0 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme +++ b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme @@ -27,8 +27,6 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES" - enableAddressSanitizer = "YES" - enableUBSanitizer = "YES" disableMainThreadChecker = "YES" codeCoverageEnabled = "YES"> @@ -67,6 +65,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + enableAddressSanitizer = "YES" enableASanStackUseAfterReturn = "YES" enableUBSanitizer = "YES" disableMainThreadChecker = "YES"