diff --git a/.gitignore b/.gitignore index 23df2f576..e2fbc96f2 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,8 @@ # Build results +dotnet.xcconfig + [Dd]ebug/ [Rr]elease/ x64/ diff --git a/src/MeloNX/MeloNX.xcodeproj/project.pbxproj b/src/MeloNX/MeloNX.xcodeproj/project.pbxproj index ea39e22de..095900633 100644 --- a/src/MeloNX/MeloNX.xcodeproj/project.pbxproj +++ b/src/MeloNX/MeloNX.xcodeproj/project.pbxproj @@ -27,6 +27,7 @@ 4E0DED342D05695D00FEF007 /* SwiftUIJoystick in Frameworks */ = {isa = PBXBuildFile; productRef = 4E0DED332D05695D00FEF007 /* SwiftUIJoystick */; }; 4E4854022D138D7600A446A6 /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E80AA622CD7122800029585 /* GameController.framework */; }; 4EA5AE822D16807500AD0B9F /* SwiftSVG in Frameworks */ = {isa = PBXBuildFile; productRef = 4EA5AE812D16807500AD0B9F /* SwiftSVG */; }; + BD43C6312D1B8212003BBC42 /* dotnet.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = BD43C6302D1B8211003BBC42 /* dotnet.xcconfig */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -79,6 +80,7 @@ 4E80A9A72CD6F54700029585 /* MeloNXUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MeloNXUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 4E80AA622CD7122800029585 /* GameController.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameController.framework; path = System/Library/Frameworks/GameController.framework; sourceTree = SDKROOT; }; BD43C6282D1B2514003BBC42 /* Ryujinx.Headless.SDL2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = Ryujinx.Headless.SDL2.dylib; path = "MeloNX/Dependencies/Dynamic Libraries/Ryujinx.Headless.SDL2.dylib"; sourceTree = ""; }; + BD43C6302D1B8211003BBC42 /* dotnet.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = dotnet.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ @@ -217,6 +219,7 @@ 4E80A9842CD6F54500029585 = { isa = PBXGroup; children = ( + BD43C6302D1B8211003BBC42 /* dotnet.xcconfig */, BD43C6282D1B2514003BBC42 /* Ryujinx.Headless.SDL2.dylib */, 4E80A98F2CD6F54500029585 /* MeloNX */, 4E80A9A02CD6F54700029585 /* MeloNXTests */, @@ -253,7 +256,7 @@ buildConfigurationList = BD43C61E2D1B23AB003BBC42 /* Build configuration list for PBXLegacyTarget "Ryujinx" */; buildPhases = ( ); - buildToolPath = "$(HOME)/.dotnet/dotnet"; + buildToolPath = "$(DOTNET_PATH)"; buildWorkingDirectory = "$(SRCROOT)/../.."; dependencies = ( ); @@ -399,6 +402,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + BD43C6312D1B8212003BBC42 /* dotnet.xcconfig in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1058,6 +1062,7 @@ }; BD43C61F2D1B23AB003BBC42 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = BD43C6302D1B8211003BBC42 /* dotnet.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; DEBUGGING_SYMBOLS = YES; @@ -1074,6 +1079,7 @@ }; BD43C6202D1B23AB003BBC42 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = BD43C6302D1B8211003BBC42 /* dotnet.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; diff --git a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/june.xcuserdatad/UserInterfaceState.xcuserstate b/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/june.xcuserdatad/UserInterfaceState.xcuserstate index 337a1297b..ebc8d0112 100644 Binary files a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/june.xcuserdatad/UserInterfaceState.xcuserstate and b/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/june.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/src/MeloNX/dotnet.xcconfig.example b/src/MeloNX/dotnet.xcconfig.example new file mode 100644 index 000000000..c9d6d4fad --- /dev/null +++ b/src/MeloNX/dotnet.xcconfig.example @@ -0,0 +1,11 @@ +// +// dotnet.xcconfig +// MeloNX +// +// Created by June P on 12/25/24. +// + +// Configuration settings file format documentation can be found at: +// https://help.apple.com/xcode/#/dev745c5c974 + +DOTNET_PATH = $(HOME)/.dotnet/dotnet