diff --git a/src/ARMeilleure/Translation/Cache/JitCache.cs b/src/ARMeilleure/Translation/Cache/JitCache.cs index ae2e30c0d..d3c71bc75 100644 --- a/src/ARMeilleure/Translation/Cache/JitCache.cs +++ b/src/ARMeilleure/Translation/Cache/JitCache.cs @@ -80,7 +80,6 @@ namespace ARMeilleure.Translation.Cache if (OperatingSystem.IsIOS()) { - ReprotectAsWritable(funcOffset, code.Length); Marshal.Copy(code, 0, funcPtr, code.Length); ReprotectAsExecutable(funcOffset, code.Length); diff --git a/src/MeloNX/MeloNX.xcodeproj/project.pbxproj b/src/MeloNX/MeloNX.xcodeproj/project.pbxproj index d291e1153..9d09cc392 100644 --- a/src/MeloNX/MeloNX.xcodeproj/project.pbxproj +++ b/src/MeloNX/MeloNX.xcodeproj/project.pbxproj @@ -8,7 +8,7 @@ /* Begin PBXBuildFile section */ 4E6715ED2CFEEB6D00425F0C /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E80AA622CD7122800029585 /* GameController.framework */; }; - 4E80AA212CD705DD00029585 /* SDL in Frameworks */ = {isa = PBXBuildFile; productRef = 4E80AA202CD705DD00029585 /* SDL */; }; + 4E8BE4EC2D16C3F300BE08EA /* SwiftUIJoystick in Frameworks */ = {isa = PBXBuildFile; productRef = 4E8BE4EB2D16C3F300BE08EA /* SwiftUIJoystick */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -62,6 +62,7 @@ 4E6715F12CFEEB6E00425F0C /* Exceptions for "MeloNX" folder in "Embed Libraries" phase from "MeloNX" target */ = { isa = PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet; attributesByRelativePath = { + "Dependencies/Dynamic Libraries/Ryujinx.Headless.SDL2.dylib" = (CodeSignOnCopy, ); "Dependencies/Dynamic Libraries/libMoltenVK.dylib" = (CodeSignOnCopy, ); "Dependencies/Dynamic Libraries/libavcodec.dylib" = (CodeSignOnCopy, ); "Dependencies/Dynamic Libraries/libavutil.dylib" = (CodeSignOnCopy, ); @@ -81,6 +82,7 @@ "Dependencies/Dynamic Libraries/libavcodec.dylib", "Dependencies/Dynamic Libraries/libavutil.dylib", "Dependencies/Dynamic Libraries/libMoltenVK.dylib", + "Dependencies/Dynamic Libraries/Ryujinx.Headless.SDL2.dylib", Dependencies/XCFrameworks/libavcodec.xcframework, Dependencies/XCFrameworks/libavfilter.xcframework, Dependencies/XCFrameworks/libavformat.xcframework, @@ -122,8 +124,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4E8BE4EC2D16C3F300BE08EA /* SwiftUIJoystick in Frameworks */, 4E6715ED2CFEEB6D00425F0C /* GameController.framework in Frameworks */, - 4E80AA212CD705DD00029585 /* SDL in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -194,7 +196,7 @@ ); name = MeloNX; packageProductDependencies = ( - 4E80AA202CD705DD00029585 /* SDL */, + 4E8BE4EB2D16C3F300BE08EA /* SwiftUIJoystick */, ); productName = MeloNX; productReference = 4E80A98D2CD6F54500029585 /* MeloNX.app */; @@ -279,7 +281,7 @@ mainGroup = 4E80A9842CD6F54500029585; minimizedProjectReferenceProxies = 1; packageReferences = ( - 4E80AA1F2CD705DD00029585 /* XCRemoteSwiftPackageReference "SwiftSDL2" */, + 4E8BE4EA2D16C3F300BE08EA /* XCRemoteSwiftPackageReference "SwiftUIJoystick" */, ); preferredProjectObjectVersion = 77; productRefGroup = 4E80A98E2CD6F54500029585 /* Products */; @@ -837,21 +839,21 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - 4E80AA1F2CD705DD00029585 /* XCRemoteSwiftPackageReference "SwiftSDL2" */ = { + 4E8BE4EA2D16C3F300BE08EA /* XCRemoteSwiftPackageReference "SwiftUIJoystick" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/ctreffs/SwiftSDL2"; + repositoryURL = "https://github.com/michael94ellis/SwiftUIJoystick"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 1.4.1; + minimumVersion = 1.5.0; }; }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 4E80AA202CD705DD00029585 /* SDL */ = { + 4E8BE4EB2D16C3F300BE08EA /* SwiftUIJoystick */ = { isa = XCSwiftPackageProductDependency; - package = 4E80AA1F2CD705DD00029585 /* XCRemoteSwiftPackageReference "SwiftSDL2" */; - productName = SDL; + package = 4E8BE4EA2D16C3F300BE08EA /* XCRemoteSwiftPackageReference "SwiftUIJoystick" */; + productName = SwiftUIJoystick; }; /* End XCSwiftPackageProductDependency section */ }; diff --git a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 3e2cd50f1..6af5f2dd7 100644 --- a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,13 +1,13 @@ { - "originHash" : "188cbfb6a5b52c41d3df0f972db675022d152bd432fecbf1b5a68f66e3956cb5", + "originHash" : "0c2b07bd02731650383ed39e41433281bed19b2ed6cc7103e7daec7fb1d05e44", "pins" : [ { - "identity" : "swiftsdl2", + "identity" : "swiftuijoystick", "kind" : "remoteSourceControl", - "location" : "https://github.com/ctreffs/SwiftSDL2", + "location" : "https://github.com/michael94ellis/SwiftUIJoystick", "state" : { - "revision" : "30a2886bd68e43fc19ba29b63ffe230ac0e4db7a", - "version" : "1.4.1" + "revision" : "5bd303cdafb369a70a45c902538b42dd3c5f4d65", + "version" : "1.5.0" } } ],