ryujinx-backup/Opentk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix keyboard detection on windows, removed minimal

Browse source
This commit is contained in:
emmaus 2018-10-13 10:22:50 +00:00
parent 835af54e12
commit c847e1f0e4
22 changed files with 19 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OpenTK.sln
View file

@ -45,6 +45,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "vk.generator", "src\vk.gene
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "vk.rewrite", "src\vk.rewrite\vk.rewrite.csproj", "{3E9B1C4D-BCB4-418A-A94E-DD164A19C6A2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\opentk-examples\src\test\test.csproj", "{9FA5D0A1-BE90-476D-8BA7-3C1A0D9D7D4A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -103,6 +105,10 @@ Global
{3E9B1C4D-BCB4-418A-A94E-DD164A19C6A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3E9B1C4D-BCB4-418A-A94E-DD164A19C6A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3E9B1C4D-BCB4-418A-A94E-DD164A19C6A2}.Release|Any CPU.Build.0 = Release|Any CPU
{9FA5D0A1-BE90-476D-8BA7-3C1A0D9D7D4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9FA5D0A1-BE90-476D-8BA7-3C1A0D9D7D4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9FA5D0A1-BE90-476D-8BA7-3C1A0D9D7D4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9FA5D0A1-BE90-476D-8BA7-3C1A0D9D7D4A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

2
src/OpenTK/Graphics/Color4.cs
View file

@ -24,9 +24,7 @@
//
using System;
#if !MINIMAL
using System.Drawing;
#endif
namespace OpenTK.Graphics
{

2
src/OpenTK/Graphics/ES20/Helper.cs
View file

@ -24,9 +24,7 @@
//
using System;
#if !MINIMAL
using System.Drawing;
#endif
using System.Runtime.InteropServices;
using System.Text;

2
src/OpenTK/Graphics/ES30/Helper.cs
View file

@ -24,9 +24,7 @@
//
using System;
#if !MINIMAL
using System.Drawing;
#endif
using System.Runtime.InteropServices;
using System.Text;

4
src/OpenTK/Graphics/OpenGL/GLHelper.cs
View file

@ -25,9 +25,7 @@
using System;
#if !MINIMAL
using System.Drawing;
#endif
using System.Text;
using System.Runtime.InteropServices;
@ -2772,7 +2770,7 @@ namespace OpenTK.Graphics.OpenGL
}
}
}
#if MINIMAL
#if !MINIMAL
/// <summary>
/// [requires: v1.0]
/// Set the viewport. This function assumes a lower left corner of (0, 0).

2
src/OpenTK/Graphics/OpenGL4/Helper.cs
View file

@ -24,9 +24,7 @@
//
using System;
#if !MINIMAL
using System.Drawing;
#endif
using System.Runtime.InteropServices;
using System.Text;

2
src/OpenTK/INativeWindow.cs
View file

@ -25,9 +25,7 @@
using System;
using System.ComponentModel;
#if !MINIMAL
using System.Drawing;
#endif
using OpenTK.Platform;
namespace OpenTK

2
src/OpenTK/Minimal.cs
View file

@ -1,4 +1,4 @@
#if ANDROID || IPHONE || MINIMAL
#if (ANDROID || IPHONE || MINIMAL) && !NETSTANDARD
using System;
#if !MINIMAL

2
src/OpenTK/NativeWindow.cs
View file

@ -25,9 +25,7 @@
using System;
using System.ComponentModel;
#if !MINIMAL
using System.Drawing;
#endif
using OpenTK.Graphics;
using OpenTK.Graphics.Vulkan;
using OpenTK.Input;

12
src/OpenTK/OpenTK.Standard.csproj
View file

@ -3,7 +3,7 @@
<AssemblyName>OpenTK</AssemblyName>
<TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>OpenTK</RootNamespace>
<DefineConstants>DEBUG;TRACE;WIN32;CARBON;X11;OPENGL;OPENGLES;MINIMAL</DefineConstants>
<DefineConstants>TRACE;DEBUG;WIN32;CARBON;X11;OPENGL;OPENGLES;NETSTANDARD</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
@ -68,7 +68,7 @@
</ItemGroup>
<PropertyGroup>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>1.0.5</Version>
<Version>1.0.7</Version>
<Description>The Open Toolkit library (OpenTK) is an advanced, low-level C# wrapper for OpenGL, OpenGL ES, OpenAL and Vulkan.
It is suitable for games, scientific visualizations and projects that require 3d graphics, audio or compute functionality.
@ -84,8 +84,8 @@ This version can be found at https://github.com/Ryujinx/Opentk</Description>
<Company>emmaus</Company>
<Product>OpenTK</Product>
<PackageProjectUrl>https://github.com/Ryujinx/Opentk</PackageProjectUrl>
<AssemblyVersion>1.0.5.0</AssemblyVersion>
<FileVersion>1.0.5.0</FileVersion>
<AssemblyVersion>1.0.7.0</AssemblyVersion>
<FileVersion>1.0.7.0</FileVersion>
</PropertyGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="$(OutputPath)..\..\..\..\Generator.Rewrite\bin\Debug\Rewrite.exe --assembly $(OutputPath)OpenTK.dll --signing-key ..\..\OpenTK.snk -debug -netstandard" Condition="$(OS) == 'Windows_NT' and $(Configuration) == 'Debug'" />
@ -108,7 +108,9 @@ This version can be found at https://github.com/Ryujinx/Opentk</Description>
</MonoDevelop>
</ProjectExtensions>
<ItemGroup>
<PackageReference Include="System.Drawing.Common" Version="4.5.0" />
<PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0" />
<PackageReference Include="Microsoft.Win32.SystemEvents" Version="4.5.0" />
<PackageReference Include="System.Drawing.Common" Version="4.5.1" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
</ItemGroup>
<ItemGroup>

2
src/OpenTK/Platform/Linux/LinuxNativeWindow.cs
View file

@ -27,9 +27,7 @@
using System;
using System.Diagnostics;
#if !MINIMAL
using System.Drawing;
#endif
using OpenTK.Graphics;
using OpenTK.Input;
using OpenTK.Platform.Egl;

2
src/OpenTK/Platform/MacOS/Cocoa/Cocoa.cs
View file

@ -27,10 +27,8 @@
using System.Runtime.InteropServices;
using System;
#if !MINIMAL
using System.Drawing;
using System.Drawing.Imaging;
#endif
namespace OpenTK.Platform.MacOS
{

2
src/OpenTK/Platform/MacOS/Cocoa/NSFloat.cs
View file

@ -26,9 +26,7 @@
//
using System;
#if !MINIMAL
using System.Drawing;
#endif
using System.Runtime.InteropServices;
namespace OpenTK.Platform.MacOS

2
src/OpenTK/Platform/MacOS/CocoaNativeWindow.cs
View file

@ -28,9 +28,7 @@
using System;
using System.ComponentModel;
using System.Diagnostics;
#if !MINIMAL
using System.Drawing;
#endif
using System.Runtime.InteropServices;
using System.Threading;
using OpenTK.Graphics;

2
src/OpenTK/Platform/NativeWindowBase.cs
View file

@ -28,9 +28,7 @@
using System;
using System.ComponentModel;
using System.Diagnostics;
#if !MINIMAL
using System.Drawing;
#endif
using OpenTK.Input;
namespace OpenTK.Platform

6
src/OpenTK/Platform/SDL2/Sdl2NativeWindow.cs
View file

@ -26,14 +26,8 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
#if !MINIMAL
using System.Drawing;
#endif
#if ANDROID || IPHONE || MINIMAL
using OpenTK.Minimal;
#else
using System.Drawing.Imaging;
#endif
using System.Runtime.InteropServices;
using OpenTK.Input;
using System.Text;

2
src/OpenTK/Platform/Windows/API.cs
View file

@ -2717,7 +2717,7 @@ namespace OpenTK.Platform.Windows
public char dbcc_name;
}
#if ANDROID || IPHONE || MINIMAL
#if (ANDROID || IPHONE || MINIMAL) && !NETSTANDARD
internal class RegistryKey
{

2
src/OpenTK/Platform/Windows/WinDisplayDevice.cs
View file

@ -26,9 +26,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
#if !MINIMAL
using Microsoft.Win32;
#endif
namespace OpenTK.Platform.Windows
{

2
src/OpenTK/Platform/Windows/WinGLNative.cs
View file

@ -28,10 +28,8 @@ using System.Diagnostics;
using System.Runtime.InteropServices;
using System.Text;
using OpenTK.Input;
#if !MINIMAL
using System.Drawing;
using System.Drawing.Imaging;
#endif
namespace OpenTK.Platform.Windows
{

2
src/OpenTK/Platform/Windows/WinRawKeyboard.cs
View file

@ -27,7 +27,7 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Runtime.InteropServices;
#if !(ANDROID || IPHONE || MINIMAL)
#if !(ANDROID || IPHONE || MINIMAL) || NETSTANDARD
using Microsoft.Win32;
#endif
using OpenTK.Input;

7
src/OpenTK/Platform/X11/Functions.cs
View file

@ -5,14 +5,11 @@
*/
using System;
#if !MINIMAL
using System.Drawing;
#endif
#if ANDROID || IPHONE || MINIMAL
#if (ANDROID || IPHONE || MINIMAL) && !NETSTANDARD
using OpenTK.Minimal;
#else
using System.Drawing.Imaging;
#endif
using System.Drawing.Imaging;
using System.Text;
using System.Runtime.InteropServices;

2
src/OpenTK/Platform/X11/X11GLNative.cs
View file

@ -26,9 +26,7 @@
using System;
using System.ComponentModel;
using System.Diagnostics;
#if !MINIMAL
using System.Drawing;
#endif
using System.Reflection;
using System.Runtime.InteropServices;
using System.Text;