Skip to content

Commit

Permalink
Fix Odyssey2
Browse files Browse the repository at this point in the history 
Signed-off-by: Joseph Mattello <[email protected]>
  • Loading branch information
@JoeMatt
JoeMatt committed Dec 15, 2021
1 parent c3c3150 commit 501aeb5
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 233 deletions.
2 changes: 1 addition & 1 deletion Cores/O2EM
Submodule O2EM updated 2 files
+1 −1 Core.plist
+6 −0 O2EM.xcodeproj/project.pbxproj
2 changes: 1 addition & 1 deletion PVLibrary/PVLibrary/Configuration/PVEmulatorConfiguration+Frameworks.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public extension PVEmulatorConfiguration {
}

class func setPropertiesTo(pvSystem: PVSystem, fromSystemPlistEntry system: SytemPlistEntry) {
pvSystem.openvgDatabaseID = Int(system.PVDatabaseID)!
pvSystem.openvgDatabaseID = Int(system.PVDatabaseID) ?? -1
pvSystem.requiresBIOS = system.PVRequiresBIOS ?? false
pvSystem.manufacturer = system.PVManufacturer
pvSystem.bit = Int(system.PVBit) ?? 0
Expand Down
17 changes: 16 additions & 1 deletion PVLibrary/PVLibrary/Resources/systems.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3364,6 +3364,21 @@
</array>
</dict>
<dict>
<key>PVBIOSNames</key>
<array>
<dict>
<key>Description</key>
<string>Magnox Odyssey2 BIOS</string>
<key>MD5</key>
<string>562d5ebf9e030a40d6fabfc2f33139fd</string>
<key>Name</key>
<string>o2rom.bin</string>
<key>Size</key>
<integer>1024</integer>
</dict>
</array>
<key>PVRequiresBIOS</key>
<true/>
<key>PVManufacturer</key>
<string>Magnavox</string>
<key>PVSystemName</key>
Expand All @@ -3379,7 +3394,7 @@
<key>PVSystemIdentifier</key>
<string>com.provenance.odyssey2</string>
<key>PVDatabaseID</key>
<string></string>
<string>-1</string>
<key>PVSupportedExtensions</key>
<array>
<string>bin</string>
Expand Down
226 changes: 2 additions & 224 deletions Provenance.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,6 @@
B3054372272026E800F5257D /* PVPSPControllerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3054370272026E800F5257D /* PVPSPControllerViewController.swift */; };
B306E0CF2769F2C2001DC52E /* PVOdyssey2ControllerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B306E0CE2769F2C2001DC52E /* PVOdyssey2ControllerViewController.swift */; };
B306E0D02769F2C2001DC52E /* PVOdyssey2ControllerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B306E0CE2769F2C2001DC52E /* PVOdyssey2ControllerViewController.swift */; };
B306E0F72769F6D9001DC52E /* PVO2EM.h in Headers */ = {isa = PBXBuildFile; fileRef = B306E0F62769F6D9001DC52E /* PVO2EM.h */; settings = {ATTRIBUTES = (Public, ); }; };
B306E0FA2769F6D9001DC52E /* PVO2EM.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B306E0F42769F6D9001DC52E /* PVO2EM.framework */; };
B306E0FB2769F6D9001DC52E /* PVO2EM.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B306E0F42769F6D9001DC52E /* PVO2EM.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
B31117B0218EB3A900C495A2 /* PVEmulatorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A164EB217BC03E800FAC391 /* PVEmulatorViewController.swift */; };
B31117B1218EB3AA00C495A2 /* PVEmulatorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A164EB217BC03E800FAC391 /* PVEmulatorViewController.swift */; };
B31117B3218EB3AE00C495A2 /* PVButtonGroupOverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3F64ED1205CD20800C273C7 /* PVButtonGroupOverlayView.swift */; };
Expand Down Expand Up @@ -481,13 +478,6 @@
remoteGlobalIDString = 1A3D409317B2DCE4004DFFFC;
remoteInfo = Provenance;
};
B306E0F82769F6D9001DC52E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1A3D408C17B2DCE4004DFFFC /* Project object */;
proxyType = 1;
remoteGlobalIDString = B306E0F32769F6D9001DC52E;
remoteInfo = PVO2EM;
};
B36FE830218EAAD200F858F3 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1A3D408C17B2DCE4004DFFFC /* Project object */;
Expand Down Expand Up @@ -578,7 +568,6 @@
dstSubfolderSpec = 10;
files = (
55546DF2257D6CA800616332 /* PVTGBDual.framework in Embed Frameworks */,
B306E0FB2769F6D9001DC52E /* PVO2EM.framework in Embed Frameworks */,
B3CB85C01E9BFB07009155A6 /* PVPokeMini.framework in Embed Frameworks */,
B316B4E521926D7400693472 /* PVReicast.framework in Embed Frameworks */,
B324C6202192057E009F4EDC /* PVFCEU.framework in Embed Frameworks */,
Expand Down Expand Up @@ -724,8 +713,8 @@
B305436D2720237400F5257D /* PVPPSSPP.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PVPPSSPP.framework; sourceTree = BUILT_PRODUCTS_DIR; };
B3054370272026E800F5257D /* PVPSPControllerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PVPSPControllerViewController.swift; sourceTree = "<group>"; };
B306E0CE2769F2C2001DC52E /* PVOdyssey2ControllerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PVOdyssey2ControllerViewController.swift; sourceTree = "<group>"; };
B306E0F42769F6D9001DC52E /* PVO2EM.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PVO2EM.framework; sourceTree = BUILT_PRODUCTS_DIR; };
B306E0F62769F6D9001DC52E /* PVO2EM.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PVO2EM.h; sourceTree = "<group>"; };
B306E1412769FE65001DC52E /* PVO2EM.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PVO2EM.framework; sourceTree = BUILT_PRODUCTS_DIR; };
B309C7A42717C49F00279529 /* PVFlycast.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PVFlycast.framework; sourceTree = BUILT_PRODUCTS_DIR; };
B309C7A72717C4B500279529 /* PVFlycast.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PVFlycast.framework; sourceTree = BUILT_PRODUCTS_DIR; };
B30C6E20271D823F0025DD88 /* PVPPSSPP.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PVPPSSPP.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -1005,7 +994,6 @@
B336B91926B3A21800960A81 /* QuickTableViewController in Frameworks */,
B312805E274C60EC00550720 /* SteamController in Frameworks */,
B3C9D5E71DEAA7E80068D057 /* PVStella.framework in Frameworks */,
B306E0FA2769F6D9001DC52E /* PVO2EM.framework in Frameworks */,
1A3D409C17B2DCE4004DFFFC /* CoreGraphics.framework in Frameworks */,
B3DB1EF127683D8600806B43 /* AltKit in Frameworks */,
);
Expand Down Expand Up @@ -1071,13 +1059,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
B306E0F12769F6D9001DC52E /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
B3E21D68203211BE009939D3 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -1177,14 +1158,14 @@
1AD481B41BA350A400FDA50A /* Provenance.app */,
BE9FDCB71C210B9E0046DF0E /* TopShelf.appex */,
B3E21D6B203211BE009939D3 /* Spotlight.appex */,
B306E0F42769F6D9001DC52E /* PVO2EM.framework */,
);
name = Products;
sourceTree = "<group>";
};
1A3D409617B2DCE4004DFFFC /* Frameworks */ = {
isa = PBXGroup;
children = (
B306E1412769FE65001DC52E /* PVO2EM.framework */,
B3D54EF42768306200476241 /* SwiftUI.framework */,
B3D54EF62768308100476241 /* SwiftUI.framework */,
B33625FB26EDF88200DC41EA /* Metal.framework */,
Expand Down Expand Up @@ -1815,17 +1796,6 @@
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
B306E0EF2769F6D9001DC52E /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
B306E0F72769F6D9001DC52E /* PVO2EM.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */

/* Begin PBXNativeTarget section */
1A3D409317B2DCE4004DFFFC /* Provenance */ = {
isa = PBXNativeTarget;
Expand All @@ -1844,7 +1814,6 @@
B383226426ED9F080029D12F /* PBXTargetDependency */,
B3B29D462156183D00903290 /* PBXTargetDependency */,
B36FE831218EAAD200F858F3 /* PBXTargetDependency */,
B306E0F92769F6D9001DC52E /* PBXTargetDependency */,
);
name = Provenance;
packageProductDependencies = (
Expand Down Expand Up @@ -1908,24 +1877,6 @@
productReference = 1AD9AA351ACC988F00EC87A0 /* Provenance Tests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
B306E0F32769F6D9001DC52E /* PVO2EM */ = {
isa = PBXNativeTarget;
buildConfigurationList = B306E0FC2769F6D9001DC52E /* Build configuration list for PBXNativeTarget "PVO2EM" */;
buildPhases = (
B306E0EF2769F6D9001DC52E /* Headers */,
B306E0F02769F6D9001DC52E /* Sources */,
B306E0F12769F6D9001DC52E /* Frameworks */,
B306E0F22769F6D9001DC52E /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = PVO2EM;
productName = PVO2EM;
productReference = B306E0F42769F6D9001DC52E /* PVO2EM.framework */;
productType = "com.apple.product-type.framework";
};
B3E21D6A203211BE009939D3 /* Spotlight */ = {
isa = PBXNativeTarget;
buildConfigurationList = B3E21D73203211BE009939D3 /* Build configuration list for PBXNativeTarget "Spotlight" */;
Expand Down Expand Up @@ -2019,9 +1970,6 @@
LastSwiftMigration = 1000;
TestTargetID = 1A3D409317B2DCE4004DFFFC;
};
B306E0F32769F6D9001DC52E = {
CreatedOnToolsVersion = 13.0;
};
B383225D26ED9C530029D12F = {
CreatedOnToolsVersion = 13.0;
};
Expand Down Expand Up @@ -2081,7 +2029,6 @@
B3B29D3F2156177100903290 /* Create Version files */,
B3B29D4D21561F0600903290 /* Setup Code-Signing */,
B383225D26ED9C530029D12F /* Check Git Submodules */,
B306E0F32769F6D9001DC52E /* PVO2EM */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -2137,13 +2084,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
B306E0F22769F6D9001DC52E /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -2586,13 +2526,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
B306E0F02769F6D9001DC52E /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
B3E21D67203211BE009939D3 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -2619,11 +2552,6 @@
target = 1A3D409317B2DCE4004DFFFC /* Provenance */;
targetProxy = 1AD9AA511ACC9FA800EC87A0 /* PBXContainerItemProxy */;
};
B306E0F92769F6D9001DC52E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = B306E0F32769F6D9001DC52E /* PVO2EM */;
targetProxy = B306E0F82769F6D9001DC52E /* PBXContainerItemProxy */;
};
B36FE831218EAAD200F858F3 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
platformFilter = ios;
Expand Down Expand Up @@ -3216,146 +3144,6 @@
};
name = Release;
};
B306E0FD2769F6D9001DC52E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = S32Z3HMYVQ;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2021 Provenance Emu. All rights reserved.";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "org.provenance-emu.PVO2EM";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
TARGETED_DEVICE_FAMILY = "1,2";
VERSION_INFO_PREFIX = "";
};
name = Debug;
};
B306E0FE2769F6D9001DC52E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = S32Z3HMYVQ;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_NS_ASSERTIONS = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2021 Provenance Emu. All rights reserved.";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "org.provenance-emu.PVO2EM";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
TARGETED_DEVICE_FAMILY = "1,2";
VERSION_INFO_PREFIX = "";
};
name = Release;
};
B306E0FF2769F6D9001DC52E /* Archive */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = S32Z3HMYVQ;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_NS_ASSERTIONS = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2021 Provenance Emu. All rights reserved.";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "org.provenance-emu.PVO2EM";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
TARGETED_DEVICE_FAMILY = "1,2";
VERSION_INFO_PREFIX = "";
};
name = Archive;
};
B3721CEB21912B7400433E4C /* Archive */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -3938,16 +3726,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
B306E0FC2769F6D9001DC52E /* Build configuration list for PBXNativeTarget "PVO2EM" */ = {
isa = XCConfigurationList;
buildConfigurations = (
B306E0FD2769F6D9001DC52E /* Debug */,
B306E0FE2769F6D9001DC52E /* Release */,
B306E0FF2769F6D9001DC52E /* Archive */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
B383225E26ED9C530029D12F /* Build configuration list for PBXAggregateTarget "Check Git Submodules" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Expand Down
Loading

0 comments on commit 501aeb5

Please sign in to comment.