diff --git a/Mini vMac.xcodeproj/project.pbxproj b/Mini vMac.xcodeproj/project.pbxproj index 4cf4366..d0b0be1 100644 --- a/Mini vMac.xcodeproj/project.pbxproj +++ b/Mini vMac.xcodeproj/project.pbxproj @@ -1415,6 +1415,10 @@ PRODUCT_BUNDLE_IDENTIFIER = net.namedfork.minivmac.macplus4m; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator"; + SUPPORTS_MACCATALYST = YES; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + TARGETED_DEVICE_FAMILY = "1,2,7"; USER_HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)\"", "\"$(SRCROOT)/Mini vMac/\"", @@ -1451,6 +1455,10 @@ PRODUCT_BUNDLE_IDENTIFIER = net.namedfork.minivmac.macplus4m; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator"; + SUPPORTS_MACCATALYST = YES; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + TARGETED_DEVICE_FAMILY = "1,2,7"; USER_HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)\"", "\"$(SRCROOT)/Mini vMac/\"", @@ -1487,6 +1495,10 @@ PRODUCT_BUNDLE_IDENTIFIER = net.namedfork.minivmac.macii; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator"; + SUPPORTS_MACCATALYST = YES; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + TARGETED_DEVICE_FAMILY = "1,2,7"; USER_HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)\"", "\"$(SRCROOT)/Mini vMac/\"", @@ -1523,6 +1535,10 @@ PRODUCT_BUNDLE_IDENTIFIER = net.namedfork.minivmac.macii; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator"; + SUPPORTS_MACCATALYST = YES; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + TARGETED_DEVICE_FAMILY = "1,2,7"; USER_HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)\"", "\"$(SRCROOT)/Mini vMac/\"", @@ -1559,6 +1575,10 @@ PRODUCT_BUNDLE_IDENTIFIER = net.namedfork.minivmac.mac128k; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator"; + SUPPORTS_MACCATALYST = YES; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + TARGETED_DEVICE_FAMILY = "1,2,7"; USER_HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)\"", "\"$(SRCROOT)/Mini vMac/\"", @@ -1595,6 +1615,10 @@ PRODUCT_BUNDLE_IDENTIFIER = net.namedfork.minivmac.mac128k; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator"; + SUPPORTS_MACCATALYST = YES; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + TARGETED_DEVICE_FAMILY = "1,2,7"; USER_HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)\"", "\"$(SRCROOT)/Mini vMac/\"", @@ -1631,6 +1655,10 @@ PRODUCT_BUNDLE_IDENTIFIER = "net.namedfork.minivmac.macii-640x480"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator"; + SUPPORTS_MACCATALYST = YES; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + TARGETED_DEVICE_FAMILY = "1,2,7"; USER_HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)\"", "\"$(SRCROOT)/Mini vMac/\"", @@ -1667,6 +1695,10 @@ PRODUCT_BUNDLE_IDENTIFIER = "net.namedfork.minivmac.macii-640x480"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator"; + SUPPORTS_MACCATALYST = YES; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + TARGETED_DEVICE_FAMILY = "1,2,7"; USER_HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)\"", "\"$(SRCROOT)/Mini vMac/\"", @@ -1703,6 +1735,10 @@ PRODUCT_BUNDLE_IDENTIFIER = "net.namedfork.minivmac.macii-640x480"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator"; + SUPPORTS_MACCATALYST = YES; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + TARGETED_DEVICE_FAMILY = "1,2,7"; USER_HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)\"", "\"$(SRCROOT)/Mini vMac/\"", @@ -1739,6 +1775,10 @@ PRODUCT_BUNDLE_IDENTIFIER = "net.namedfork.minivmac.macii-640x480"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator"; + SUPPORTS_MACCATALYST = YES; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + TARGETED_DEVICE_FAMILY = "1,2,7"; USER_HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)\"", "\"$(SRCROOT)/Mini vMac/\"", @@ -1802,6 +1842,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -1851,6 +1892,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -1876,6 +1918,10 @@ PRODUCT_BUNDLE_IDENTIFIER = net.namedfork.minivmac; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + TARGETED_DEVICE_FAMILY = "1,2,7"; }; name = Debug; }; @@ -1899,36 +1945,47 @@ PRODUCT_BUNDLE_IDENTIFIER = net.namedfork.minivmac; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + TARGETED_DEVICE_FAMILY = "1,2,7"; }; name = Release; }; 28F6B4951CF07DDD002D76D0 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; CLANG_ENABLE_MODULES = NO; IPHONEOS_DEPLOYMENT_TARGET = 12.0; OTHER_CFLAGS = "-DHAVE_CONFIG_H"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "xrsimulator xros watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; + SUPPORTS_MACCATALYST = YES; }; name = Debug; }; 28F6B4961CF07DDD002D76D0 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; CLANG_ENABLE_MODULES = NO; IPHONEOS_DEPLOYMENT_TARGET = 12.0; OTHER_CFLAGS = "-DHAVE_CONFIG_H"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "xrsimulator xros watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; + SUPPORTS_MACCATALYST = YES; }; name = Release; }; 28F6B4AF1CF07EC9002D76D0 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; GCC_WARN_ABOUT_RETURN_TYPE = NO; HEADER_SEARCH_PATHS = "$(SRCROOT)"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -1936,12 +1993,15 @@ OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "xrsimulator xros watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; + SUPPORTS_MACCATALYST = YES; }; name = Debug; }; 28F6B4B01CF07EC9002D76D0 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; GCC_WARN_ABOUT_RETURN_TYPE = NO; HEADER_SEARCH_PATHS = "$(SRCROOT)"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -1949,26 +2009,34 @@ OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "xrsimulator xros watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; + SUPPORTS_MACCATALYST = YES; }; name = Release; }; 28F6B4BD1CF07F32002D76D0 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; IPHONEOS_DEPLOYMENT_TARGET = 12.0; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "xrsimulator xros watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; + SUPPORTS_MACCATALYST = YES; }; name = Debug; }; 28F6B4BE1CF07F32002D76D0 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; IPHONEOS_DEPLOYMENT_TARGET = 12.0; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "xrsimulator xros watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; + SUPPORTS_MACCATALYST = YES; }; name = Release; }; diff --git a/Mini vMac.xcodeproj/xcshareddata/xcschemes/Mini vMac.xcscheme b/Mini vMac.xcodeproj/xcshareddata/xcschemes/Mini vMac.xcscheme index 252c85c..c6bf3cc 100644 --- a/Mini vMac.xcodeproj/xcshareddata/xcschemes/Mini vMac.xcscheme +++ b/Mini vMac.xcodeproj/xcshareddata/xcschemes/Mini vMac.xcscheme @@ -40,7 +40,7 @@ nameTextField.text size:size]; }]]; - [[UIApplication sharedApplication].keyWindow.rootViewController presentViewController:alertController animated:YES completion:nil]; + [sharedEmulator.rootViewController presentViewController:alertController animated:YES completion:nil]; } - (void)didMakeNewDisk:(NSString*)fileName size:(NSInteger)size { diff --git a/Mini vMac/SettingsViewController.m b/Mini vMac/SettingsViewController.m index facc4ac..7367226 100644 --- a/Mini vMac/SettingsViewController.m +++ b/Mini vMac/SettingsViewController.m @@ -372,7 +372,7 @@ typedef enum : NSInteger { // links in about NSString *linkURL = aboutItems[indexPath.row][@"link"]; if (linkURL != nil) { - [[UIApplication sharedApplication] openURL:[NSURL URLWithString:linkURL]]; + [[UIApplication sharedApplication] openURL:[NSURL URLWithString:linkURL] options:@{} completionHandler:nil]; } } } diff --git a/Mini vMac/ViewController.m b/Mini vMac/ViewController.m index f4a1384..0d5cb9b 100644 --- a/Mini vMac/ViewController.m +++ b/Mini vMac/ViewController.m @@ -90,6 +90,7 @@ API_AVAILABLE(ios(13.4)) } } +#if !defined(TARGET_OS_VISION) || TARGET_OS_VISION == 0 - (BOOL)prefersStatusBarHidden { UIScreen *screen = self.view.window.screen; return CGRectEqualToRect(screen.bounds, self.view.window.bounds); @@ -98,6 +99,7 @@ API_AVAILABLE(ios(13.4)) - (UIStatusBarStyle)preferredStatusBarStyle { return UIStatusBarStyleLightContent; } +#endif - (UIRectEdge)preferredScreenEdgesDeferringSystemGestures { return UIRectEdgeAll;