mchapman/Ryujinx-greemdev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some rebase errors

Browse Source
This commit is contained in:
Isaac Marovitz
2024-03-18 14:32:59 -04:00
committed by Evan Husted
parent df0dc4454b
commit 3c562d8906
7 changed files with 54 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Ryujinx/Ryujinx.csproj
View File

@@ -59,6 +59,7 @@
<PackageReference Include="Silk.NET.Vulkan" />
<PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" />
<PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" />
<PackageReference Include="Ryujinx.Graphics.Metal" />
<PackageReference Include="SPB" />
<PackageReference Include="SharpZipLib" />
</ItemGroup>
@@ -66,6 +67,7 @@
<ItemGroup>
<ProjectReference Include="..\Ryujinx.Audio.Backends.SDL2\Ryujinx.Audio.Backends.SDL2.csproj" />
<ProjectReference Include="..\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj" />
<ProjectReference Include="..\Ryujinx.Graphics.Metal\Ryujinx.Graphics.Metal.csproj" />
<ProjectReference Include="..\Ryujinx.Input\Ryujinx.Input.csproj" />
<ProjectReference Include="..\Ryujinx.Input.SDL2\Ryujinx.Input.SDL2.csproj" />
<ProjectReference Include="..\Ryujinx.Audio.Backends.OpenAL\Ryujinx.Audio.Backends.OpenAL.csproj" />

4
src/Ryujinx/UI/Renderer/EmbeddedWindowMetal.cs
View File

@@ -2,7 +2,7 @@ using SPB.Windowing;
using SPB.Platform.Metal;
using System;
namespace Ryujinx.UI.Renderer
namespace Ryujinx.Ava.UI.Renderer
{
public class EmbeddedWindowMetal : EmbeddedWindow
{
@@ -22,4 +22,4 @@ namespace Ryujinx.UI.Renderer
return simpleMetalWindow;
}
}
}
}