From 058166e0280839bc65ec2df71635d177a96e8927 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Mon, 28 Sep 2020 23:21:08 -0400 Subject: [PATCH] Change god knows what to make the iOS archive build work --- Gemini.xcodeproj/project.pbxproj | 105 ++++++++++++------ .../xcschemes/xcschememanagement.plist | 4 +- Gemini.xcworkspace/contents.xcworkspacedata | 7 ++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++ 4 files changed, 89 insertions(+), 35 deletions(-) create mode 100644 Gemini.xcworkspace/contents.xcworkspacedata create mode 100644 Gemini.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Gemini.xcodeproj/project.pbxproj b/Gemini.xcodeproj/project.pbxproj index f551e7b..f4ba4d8 100644 --- a/Gemini.xcodeproj/project.pbxproj +++ b/Gemini.xcodeproj/project.pbxproj @@ -145,21 +145,49 @@ remoteGlobalIDString = D62664A724BBF26A00DF9B88; remoteInfo = GeminiFormat; }; - D6E152B824BFFE2400FDF9D3 /* PBXContainerItemProxy */ = { + D68543F72522DEF0004C4AE0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D626645324BBF1C200DF9B88 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D6E152CF24C0007200FDF9D3; + remoteInfo = BrowserCore; + }; + D68543F92522DEF3004C4AE0 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D626645324BBF1C200DF9B88 /* Project object */; proxyType = 1; remoteGlobalIDString = D62664A724BBF26A00DF9B88; remoteInfo = GeminiFormat; }; - D6E152C524C0004C00FDF9D3 /* PBXContainerItemProxy */ = { + D68543FB2522DEF5004C4AE0 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D626645324BBF1C200DF9B88 /* Project object */; proxyType = 1; remoteGlobalIDString = D626647624BBF22E00DF9B88; remoteInfo = GeminiProtocol; }; - D6E152C924C0004C00FDF9D3 /* PBXContainerItemProxy */ = { + D68543FD2522DEF7004C4AE0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D626645324BBF1C200DF9B88 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D62664CD24BC081B00DF9B88; + remoteInfo = GeminiRenderer; + }; + D68544062522DF36004C4AE0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D626645324BBF1C200DF9B88 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D62664A724BBF26A00DF9B88; + remoteInfo = GeminiFormat; + }; + D68544082522DF39004C4AE0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D626645324BBF1C200DF9B88 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D626647624BBF22E00DF9B88; + remoteInfo = GeminiProtocol; + }; + D685440A2522DF3C004C4AE0 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D626645324BBF1C200DF9B88 /* Project object */; proxyType = 1; @@ -187,13 +215,6 @@ remoteGlobalIDString = D6E152CF24C0007200FDF9D3; remoteInfo = BrowserCore; }; - D6E152EF24C0009300FDF9D3 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = D626645324BBF1C200DF9B88 /* Project object */; - proxyType = 1; - remoteGlobalIDString = D6E152CF24C0007200FDF9D3; - remoteInfo = BrowserCore; - }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -759,10 +780,10 @@ buildRules = ( ); dependencies = ( - D6E152B924BFFE2400FDF9D3 /* PBXTargetDependency */, - D6E152C624C0004C00FDF9D3 /* PBXTargetDependency */, - D6E152CA24C0004C00FDF9D3 /* PBXTargetDependency */, - D6E152F024C0009300FDF9D3 /* PBXTargetDependency */, + D68543FE2522DEF7004C4AE0 /* PBXTargetDependency */, + D68543FC2522DEF5004C4AE0 /* PBXTargetDependency */, + D68543FA2522DEF3004C4AE0 /* PBXTargetDependency */, + D68543F82522DEF0004C4AE0 /* PBXTargetDependency */, ); name = "Gemini-iOS"; productName = "Gemini-iOS"; @@ -781,6 +802,9 @@ buildRules = ( ); dependencies = ( + D685440B2522DF3C004C4AE0 /* PBXTargetDependency */, + D68544092522DF39004C4AE0 /* PBXTargetDependency */, + D68544072522DF36004C4AE0 /* PBXTargetDependency */, ); name = BrowserCore; productName = BrowserCore; @@ -1117,20 +1141,40 @@ target = D62664A724BBF26A00DF9B88 /* GeminiFormat */; targetProxy = D62664F224BC0D7700DF9B88 /* PBXContainerItemProxy */; }; - D6E152B924BFFE2400FDF9D3 /* PBXTargetDependency */ = { + D68543F82522DEF0004C4AE0 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D6E152CF24C0007200FDF9D3 /* BrowserCore */; + targetProxy = D68543F72522DEF0004C4AE0 /* PBXContainerItemProxy */; + }; + D68543FA2522DEF3004C4AE0 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = D62664A724BBF26A00DF9B88 /* GeminiFormat */; - targetProxy = D6E152B824BFFE2400FDF9D3 /* PBXContainerItemProxy */; + targetProxy = D68543F92522DEF3004C4AE0 /* PBXContainerItemProxy */; }; - D6E152C624C0004C00FDF9D3 /* PBXTargetDependency */ = { + D68543FC2522DEF5004C4AE0 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = D626647624BBF22E00DF9B88 /* GeminiProtocol */; - targetProxy = D6E152C524C0004C00FDF9D3 /* PBXContainerItemProxy */; + targetProxy = D68543FB2522DEF5004C4AE0 /* PBXContainerItemProxy */; }; - D6E152CA24C0004C00FDF9D3 /* PBXTargetDependency */ = { + D68543FE2522DEF7004C4AE0 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = D62664CD24BC081B00DF9B88 /* GeminiRenderer */; - targetProxy = D6E152C924C0004C00FDF9D3 /* PBXContainerItemProxy */; + targetProxy = D68543FD2522DEF7004C4AE0 /* PBXContainerItemProxy */; + }; + D68544072522DF36004C4AE0 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D62664A724BBF26A00DF9B88 /* GeminiFormat */; + targetProxy = D68544062522DF36004C4AE0 /* PBXContainerItemProxy */; + }; + D68544092522DF39004C4AE0 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D626647624BBF22E00DF9B88 /* GeminiProtocol */; + targetProxy = D68544082522DF39004C4AE0 /* PBXContainerItemProxy */; + }; + D685440B2522DF3C004C4AE0 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D62664CD24BC081B00DF9B88 /* GeminiRenderer */; + targetProxy = D685440A2522DF3C004C4AE0 /* PBXContainerItemProxy */; }; D6E152DB24C0007200FDF9D3 /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -1147,11 +1191,6 @@ target = D6E152CF24C0007200FDF9D3 /* BrowserCore */; targetProxy = D6E152E324C0007200FDF9D3 /* PBXContainerItemProxy */; }; - D6E152F024C0009300FDF9D3 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = D6E152CF24C0007200FDF9D3 /* BrowserCore */; - targetProxy = D6E152EF24C0009300FDF9D3 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -1356,11 +1395,11 @@ MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_BUNDLE_IDENTIFIER = space.vaccor.Gemini.GeminiProtocol; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - VALID_ARCHS = "x86_64 arm64 armv7s armv7 arm64e"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1389,10 +1428,10 @@ MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_BUNDLE_IDENTIFIER = space.vaccor.Gemini.GeminiProtocol; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; SWIFT_VERSION = 5.0; - VALID_ARCHS = "x86_64 arm64 armv7s armv7 arm64e"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1461,11 +1500,11 @@ MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_BUNDLE_IDENTIFIER = space.vaccor.Gemini.GeminiFormat; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - VALID_ARCHS = "x86_64 arm64 armv7s armv7 arm64e"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1494,10 +1533,10 @@ MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_BUNDLE_IDENTIFIER = space.vaccor.Gemini.GeminiFormat; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; SWIFT_VERSION = 5.0; - VALID_ARCHS = "x86_64 arm64 armv7s armv7 arm64e"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1566,11 +1605,11 @@ MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_BUNDLE_IDENTIFIER = space.vaccor.Gemini.GeminiRenderer; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - VALID_ARCHS = "x86_64 arm64 armv7s armv7 arm64e"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1599,10 +1638,10 @@ MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_BUNDLE_IDENTIFIER = space.vaccor.Gemini.GeminiRenderer; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; SWIFT_VERSION = 5.0; - VALID_ARCHS = "x86_64 arm64 armv7s armv7 arm64e"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1721,10 +1760,10 @@ MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_BUNDLE_IDENTIFIER = space.vaccor.Gemini.BrowserCore; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; SWIFT_VERSION = 5.0; - VALID_ARCHS = "x86_64 arm64 armv7s armv7 arm64e"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1752,10 +1791,10 @@ MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_BUNDLE_IDENTIFIER = space.vaccor.Gemini.BrowserCore; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; SWIFT_VERSION = 5.0; - VALID_ARCHS = "x86_64 arm64 armv7s armv7 arm64e"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; diff --git a/Gemini.xcodeproj/xcuserdata/shadowfacts.xcuserdatad/xcschemes/xcschememanagement.plist b/Gemini.xcodeproj/xcuserdata/shadowfacts.xcuserdatad/xcschemes/xcschememanagement.plist index 6f8d461..a21f384 100644 --- a/Gemini.xcodeproj/xcuserdata/shadowfacts.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Gemini.xcodeproj/xcuserdata/shadowfacts.xcuserdatad/xcschemes/xcschememanagement.plist @@ -27,12 +27,12 @@ GeminiProtocol.xcscheme_^#shared#^_ orderHint - 4 + 3 GeminiRenderer.xcscheme_^#shared#^_ orderHint - 3 + 4 SuppressBuildableAutocreation diff --git a/Gemini.xcworkspace/contents.xcworkspacedata b/Gemini.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..9494a9c --- /dev/null +++ b/Gemini.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Gemini.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Gemini.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Gemini.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + +