1
1
mirror of https://github.com/ryujinx-mirror/ryujinx.git synced 2025-10-02 09:45:50 -05:00

Compare commits

...

4 Commits

Author SHA1 Message Date
dependabot[bot]
2ae9c2458e nuget: bump the silk-net group with 3 updates
Bumps the silk-net group with 3 updates: [Silk.NET.Vulkan](https://github.com/dotnet/Silk.NET), [Silk.NET.Vulkan.Extensions.EXT](https://github.com/dotnet/Silk.NET) and [Silk.NET.Vulkan.Extensions.KHR](https://github.com/dotnet/Silk.NET).


Updates `Silk.NET.Vulkan` from 2.21.0 to 2.22.0
- [Release notes](https://github.com/dotnet/Silk.NET/releases)
- [Commits](https://github.com/dotnet/Silk.NET/compare/v2.21.0...v2.22.0)

Updates `Silk.NET.Vulkan` from 2.21.0 to 2.22.0
- [Release notes](https://github.com/dotnet/Silk.NET/releases)
- [Commits](https://github.com/dotnet/Silk.NET/compare/v2.21.0...v2.22.0)

Updates `Silk.NET.Vulkan.Extensions.EXT` from 2.21.0 to 2.22.0
- [Release notes](https://github.com/dotnet/Silk.NET/releases)
- [Commits](https://github.com/dotnet/Silk.NET/compare/v2.21.0...v2.22.0)

Updates `Silk.NET.Vulkan` from 2.21.0 to 2.22.0
- [Release notes](https://github.com/dotnet/Silk.NET/releases)
- [Commits](https://github.com/dotnet/Silk.NET/compare/v2.21.0...v2.22.0)

Updates `Silk.NET.Vulkan.Extensions.KHR` from 2.21.0 to 2.22.0
- [Release notes](https://github.com/dotnet/Silk.NET/releases)
- [Commits](https://github.com/dotnet/Silk.NET/compare/v2.21.0...v2.22.0)

---
updated-dependencies:
- dependency-name: Silk.NET.Vulkan
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: silk-net
- dependency-name: Silk.NET.Vulkan
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: silk-net
- dependency-name: Silk.NET.Vulkan.Extensions.EXT
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: silk-net
- dependency-name: Silk.NET.Vulkan
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: silk-net
- dependency-name: Silk.NET.Vulkan.Extensions.KHR
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: silk-net
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-06 09:33:36 +00:00
reggie
fec4f4ada9 meta: Link Greem's project 🙂 2024-10-24 11:16:46 -05:00
Iván Mestre
49574a99f5 Added a command line option (-c, --config) to load a configuration file through the command line parameters (#59) 2024-10-22 18:48:59 -05:00
reggie
68092bf00b infra: We don't need to create test-ava archives for macOS either 2024-10-22 10:37:14 -05:00
6 changed files with 46 additions and 9 deletions

View File

@@ -39,9 +39,9 @@
<PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
<PackageVersion Include="shaderc.net" Version="0.1.0" />
<PackageVersion Include="SharpZipLib" Version="1.4.2" />
<PackageVersion Include="Silk.NET.Vulkan" Version="2.21.0" />
<PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.21.0" />
<PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.21.0" />
<PackageVersion Include="Silk.NET.Vulkan" Version="2.22.0" />
<PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.22.0" />
<PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.22.0" />
<PackageVersion Include="SkiaSharp" Version="2.88.8" />
<PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.7" />
<PackageVersion Include="SPB" Version="0.0.4-build32" />

View File

@@ -1,13 +1,15 @@
[links/discord]: https://discord.gg/xmHPGDfVCa
[badges/discord]: https://img.shields.io/discord/1291765437100720243?label=ryujinx-mirror&logo=discord&logoColor=FFFFFF&color=5865F3
As of now, the [ryujinx-mirror/ryujinx](https://github.com/ryujinx-mirror/ryujinx) repository serves as a downstream hard-fork of the original Ryujinx project. For the time being, this fork won't be accepting any new *major* changes until further information arises. We have reconstructed the essential build infrastructure, and you can download nightly binaries for Windows, Linux, and MacOS from the [latest release](https://github.com/ryujinx-mirror/ryujinx/releases/latest).
As of now, the [ryujinx-mirror/ryujinx](https://github.com/ryujinx-mirror/ryujinx) repository serves as a downstream hard fork of the original Ryujinx project. You can download nightly binaries for Windows, macOS, and Linux (including `AppImage`s) from the [latest release](https://github.com/ryujinx-mirror/ryujinx/releases/latest).
> [!NOTE]
> This fork is not affiliated with the **original** Ryujinx project, or Nintendo whatsoever.
### Current Goals
If you would like a version with more new features & improvements, feel free to check out [GreemDev's fork](https://github.com/GreemDev/Ryujinx). We aim to keep this repository more focused on small fixes and infrastructure reconstruction, staying more true to the original Ryujinx project.
* ☑️ Reconstruct basic build infrastructure & workflows for this repository, based on revision hashes as opposed to semver releases (for now)
* ☑️ To be as safe as possible, remove all previous in-app and meta references to Patreon, `ryujinx.org` etc while keeping full attribution of original authors and contributors in-tact.
* Keep 'branding' as pure and faithful to the original project as possible.

View File

@@ -110,11 +110,11 @@ gzip -9 < "$RELEASE_TAR_FILE_NAME" > "$RELEASE_TAR_FILE_NAME.gz"
rm "$RELEASE_TAR_FILE_NAME"
# Create legacy update package for Avalonia to not left behind old testers.
if [ "$VERSION" != "1.1.0" ];
then
cp $RELEASE_TAR_FILE_NAME.gz test-ava-ryujinx-$VERSION-macos_universal.app.tar.gz
fi
#if [ "$VERSION" != "1.1.0" ];
#then
# cp $RELEASE_TAR_FILE_NAME.gz test-ava-ryujinx-$VERSION-macos_universal.app.tar.gz
#fi
popd
echo "Done"
echo "Done"

View File

@@ -165,6 +165,11 @@ namespace Ryujinx
? appDataConfigurationPath
: null;
if (!string.IsNullOrEmpty(CommandLineState.OverrideConfigFile) && File.Exists(CommandLineState.OverrideConfigFile))
{
ConfigurationPath = CommandLineState.OverrideConfigFile;
}
if (ConfigurationPath == null)
{
// No configuration, we load the default values and save it to disk

View File

@@ -1,5 +1,6 @@
using Ryujinx.Common.Logging;
using System.Collections.Generic;
using System.IO;
namespace Ryujinx.UI.Common.Helper
{
@@ -16,6 +17,7 @@ namespace Ryujinx.UI.Common.Helper
public static string LaunchPathArg { get; private set; }
public static string LaunchApplicationId { get; private set; }
public static bool StartFullscreenArg { get; private set; }
public static string OverrideConfigFile { get; private set; }
public static void ParseArguments(string[] args)
{
@@ -96,6 +98,29 @@ namespace Ryujinx.UI.Common.Helper
case "--software-gui":
OverrideHardwareAcceleration = false;
break;
case "-c":
case "--config":
if (i + 1 >= args.Length)
{
Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
continue;
}
string configFile = args[++i];
if (Path.GetExtension(configFile).ToLower() != ".json")
{
Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
continue;
}
OverrideConfigFile = configFile;
arguments.Add(arg);
arguments.Add(args[i]);
break;
default:
LaunchPathArg = arg;
break;

View File

@@ -150,6 +150,11 @@ namespace Ryujinx.Ava
ConfigurationPath = appDataConfigurationPath;
}
if (!string.IsNullOrEmpty(CommandLineState.OverrideConfigFile) && File.Exists(CommandLineState.OverrideConfigFile))
{
ConfigurationPath = CommandLineState.OverrideConfigFile;
}
if (ConfigurationPath == null)
{
// No configuration, we load the default values and save it to disk