mirror of
https://github.com/ryujinx-mirror/ryujinx.git
synced 2024-12-23 19:45:48 +00:00
6cb22c9d38
* openal: Update to OpenTK 4 * Ryujinx.Graphics.OpenGL: Update to OpenTK 4 * Entirely removed OpenTK 3, still wip * Use SPB for context creation and handling Still need to test on GLX and readd input support * Start implementing a new input system So far only gamepad are supported, no configuration possible via UI but detected via hotplug/removal Button mapping backend is implemented TODO: front end, configuration handling and configuration migration TODO: keyboard support * Enforce RGB only framebuffer on the GLWidget Fix possible transparent window * Implement UI gamepad frontend Also fix bad mapping of minus button and ensure gamepad config is updated in real time * Handle controller being disconnected and reconnected again * Revert "Enforce RGB only framebuffer on the GLWidget" This reverts commit 0949715d1a03ec793e35e37f7b610cbff2d63965. * Fix first color clear * Filter SDL2 events a bit * Start working on the keyboard detail - Rework configuration classes a bit to be more clean. - Integrate fully the keyboard configuration to the front end (TODO: assigner) - Start skeleton for the GTK3 keyboard driver * Add KeyboardStateSnapshot and its integration * Implement keyboard assigner and GTK3 key mapping TODO: controller configuration mapping and IGamepad implementation for keyboard * Add missing SR and SL definitions * Fix copy pasta mistake on config for previous commit * Implement IGamepad interface for GTK3 keyboard * Fix some implementation still being commented in the controller ui for keyboard * Port screen handle code * Remove all configuration management code and move HidNew to Hid * Rename InputConfigNew to InputConfig * Add a version field to the input config * Prepare serialization and deserialization of new input config and migrate profile loading and saving * Support input configuration saving to config and bump config version to 23. * Clean up in ConfigurationState * Reference SPB via a nuget package * Move new input system to Ryujinx.Input project and SDL2 detail to Ryujinx.Input.SDL2 * move GTK3 input to the right directory * Fix triggers on SDL2 * Update to SDL2 2.0.14 via our own fork * Update buttons definition for SDL2 2.0.14 and report gamepad features * Implement motion support again with SDL2 TODO: cemu hooks integration * Switch to latest of nightly SDL2 * SDL2: Fix bugs in gamepad id matching allowing different gamepad to match on the same device index * Ensure values are set in UI when the gamepad get hot plugged * Avoid trying to add controllers in the Update method and don't open SDL2 gamepad instance before checking ids This fixes permanent rumble of pro controller in some hotplug scenario * Fix more UI bugs * Move legcay motion code around before reintegration * gamecontroller UI tweaks here and there * Hide Motion on non motion configurations * Update the TODO grave Some TODO were fixed long time ago or are quite oudated... * Integrate cemu hooks motion configuration * Integrate cemu hooks configuration options to the UI again * cemuhooks => cemuhooks * Add cemu hook support again * Fix regression on normal motion and fix some very nasty bugs around * Fix for XCB multithreads issue on Linux * Enable motion by default * Block inputs in the main view when in the controller configuration window * Some fixes for the controller ui again * Add joycon support and fixes other hints * Bug fixes and clean up - Invert default mapping if not a Nintendo controller - Keep alive the controller being selected on the controller window (allow to avoid big delay for controller needing time to init when doing button assignment) - Clean up hints in use - Remove debug logs around - Fixes potential double free with SDL2Gamepad * Move the button assigner and motion logic to the Ryujinx.Input project * Reimplement raw keyboard hle input Also move out the logic of the hotkeys * Move all remaining Input manager stuffs to the Ryujinx.Input project * Increment configuration version yet again because of master changes * Ensure input config isn't null when not present * Fixes for VS not being nice * Fix broken gamepad caching logic causing crashes on ui * Ensure the background context is destroyed * Update dependencies * Readd retrocompat with old format of the config to avoid parsing and crashes on those versions Also updated the debug Config.json * Document new input APIs * Isolate SDL2Driver to the project and remove external export of it * Add support for external gamepad db mappings on SDL2 * Last clean up before PR * Addresses first part of comments * Address gdkchan's comments * Do not use JsonException * Last comment fixes
113 lines
5.8 KiB
XML
113 lines
5.8 KiB
XML
<Project Sdk="Microsoft.NET.Sdk">
|
|
|
|
<PropertyGroup>
|
|
<TargetFramework>net5.0</TargetFramework>
|
|
<RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
|
|
<OutputType>Exe</OutputType>
|
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
|
<Version>1.0.0-dirty</Version>
|
|
<TieredCompilation>false</TieredCompilation>
|
|
<TieredCompilationQuickJit>false</TieredCompilationQuickJit>
|
|
<DefineConstants Condition=" '$(ExtraDefineConstants)' != '' ">$(DefineConstants);$(ExtraDefineConstants)</DefineConstants>
|
|
</PropertyGroup>
|
|
|
|
<ItemGroup>
|
|
<PackageReference Include="DiscordRichPresence" Version="1.0.166" />
|
|
<PackageReference Include="GtkSharp" Version="3.22.25.128" />
|
|
<PackageReference Include="GtkSharp.Dependencies" Version="1.1.0" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64'" />
|
|
<PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="4.3.0" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64'" />
|
|
<PackageReference Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64'" />
|
|
<PackageReference Include="OpenTK.Graphics" Version="4.5.0" />
|
|
<PackageReference Include="SPB" Version="0.0.2" />
|
|
<PackageReference Include="SharpZipLib" Version="1.3.0" />
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<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" />
|
|
<ProjectReference Include="..\Ryujinx.Audio.Backends.SoundIo\Ryujinx.Audio.Backends.SoundIo.csproj" />
|
|
<ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />
|
|
<ProjectReference Include="..\Ryujinx.HLE\Ryujinx.HLE.csproj" />
|
|
<ProjectReference Include="..\ARMeilleure\ARMeilleure.csproj" />
|
|
<ProjectReference Include="..\Ryujinx.Graphics.OpenGL\Ryujinx.Graphics.OpenGL.csproj" />
|
|
<ProjectReference Include="..\Ryujinx.Graphics.Gpu\Ryujinx.Graphics.Gpu.csproj" />
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<None Update="alsoft.ini">
|
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
</None>
|
|
<None Update="Config.json" Condition="'$(Configuration)' == 'Debug' OR '$(Configuration)' == 'Profile Debug'">
|
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
</None>
|
|
<None Update="THIRDPARTY.md">
|
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
</None>
|
|
<ContentWithTargetPath Include="..\Ryujinx.Audio\LICENSE.txt">
|
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
<TargetPath>LICENSE-Ryujinx.Audio.txt</TargetPath>
|
|
</ContentWithTargetPath>
|
|
</ItemGroup>
|
|
|
|
<!-- Due to .net core 3.1 embedded resource loading -->
|
|
<PropertyGroup>
|
|
<EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
|
|
<ApplicationIcon>Ryujinx.ico</ApplicationIcon>
|
|
</PropertyGroup>
|
|
|
|
<PropertyGroup Condition="'$(RuntimeIdentifier)' == 'osx-x64'">
|
|
<DefineConstants>$(DefineConstants);MACOS_BUILD</DefineConstants>
|
|
</PropertyGroup>
|
|
|
|
<ItemGroup>
|
|
<None Remove="Ui\MainWindow.glade" />
|
|
<None Remove="Ui\Resources\Controller_JoyConLeft.svg" />
|
|
<None Remove="Ui\Resources\Controller_JoyConPair.svg" />
|
|
<None Remove="Ui\Resources\Controller_JoyConRight.svg" />
|
|
<None Remove="Ui\Resources\Controller_ProCon.svg" />
|
|
<None Remove="Ui\Resources\Icon_NCA.png" />
|
|
<None Remove="Ui\Resources\Icon_NRO.png" />
|
|
<None Remove="Ui\Resources\Icon_NSO.png" />
|
|
<None Remove="Ui\Resources\Icon_NSP.png" />
|
|
<None Remove="Ui\Resources\Icon_XCI.png" />
|
|
<None Remove="Ui\Resources\Logo_Amiibo.png" />
|
|
<None Remove="Ui\Resources\Logo_Discord.png" />
|
|
<None Remove="Ui\Resources\Logo_GitHub.png" />
|
|
<None Remove="Ui\Resources\Logo_Patreon.png" />
|
|
<None Remove="Ui\Resources\Logo_Ryujinx.png" />
|
|
<None Remove="Ui\Resources\Logo_Twitter.png" />
|
|
<None Remove="Ui\Widgets\ProfileDialog.glade" />
|
|
<None Remove="Ui\Windows\ControllerWindow.glade" />
|
|
<None Remove="Ui\Windows\DlcWindow.glade" />
|
|
<None Remove="Ui\Windows\SettingsWindow.glade" />
|
|
<None Remove="Ui\Windows\TitleUpdateWindow.glade" />
|
|
<None Remove="Modules\Updater\UpdateDialog.glade" />
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<EmbeddedResource Include="Ui\MainWindow.glade" />
|
|
<EmbeddedResource Include="Ui\Resources\Controller_JoyConLeft.svg" />
|
|
<EmbeddedResource Include="Ui\Resources\Controller_JoyConPair.svg" />
|
|
<EmbeddedResource Include="Ui\Resources\Controller_JoyConRight.svg" />
|
|
<EmbeddedResource Include="Ui\Resources\Controller_ProCon.svg" />
|
|
<EmbeddedResource Include="Ui\Resources\Icon_NCA.png" />
|
|
<EmbeddedResource Include="Ui\Resources\Icon_NRO.png" />
|
|
<EmbeddedResource Include="Ui\Resources\Icon_NSO.png" />
|
|
<EmbeddedResource Include="Ui\Resources\Icon_NSP.png" />
|
|
<EmbeddedResource Include="Ui\Resources\Icon_XCI.png" />
|
|
<EmbeddedResource Include="Ui\Resources\Logo_Amiibo.png" />
|
|
<EmbeddedResource Include="Ui\Resources\Logo_Discord.png" />
|
|
<EmbeddedResource Include="Ui\Resources\Logo_GitHub.png" />
|
|
<EmbeddedResource Include="Ui\Resources\Logo_Patreon.png" />
|
|
<EmbeddedResource Include="Ui\Resources\Logo_Ryujinx.png" />
|
|
<EmbeddedResource Include="Ui\Resources\Logo_Twitter.png" />
|
|
<EmbeddedResource Include="Ui\Widgets\ProfileDialog.glade" />
|
|
<EmbeddedResource Include="Ui\Windows\ControllerWindow.glade" />
|
|
<EmbeddedResource Include="Ui\Windows\DlcWindow.glade" />
|
|
<EmbeddedResource Include="Ui\Windows\SettingsWindow.glade" />
|
|
<EmbeddedResource Include="Ui\Windows\TitleUpdateWindow.glade" />
|
|
<EmbeddedResource Include="Modules\Updater\UpdateDialog.glade" />
|
|
</ItemGroup>
|
|
|
|
</Project>
|