mirror of
https://github.com/Ryujinx/Opentk.git
synced 2024-12-23 06:25:32 +00:00
Fix broken Android and iOS builds
This commit is contained in:
parent
52699104f9
commit
3686203a6a
|
@ -281,7 +281,7 @@ namespace OpenTK
|
||||||
if (!initialized)
|
if (!initialized)
|
||||||
{
|
{
|
||||||
#if ANDROID || IPHONE
|
#if ANDROID || IPHONE
|
||||||
runningOnMono = true;
|
RunningOnMono = true;
|
||||||
#else
|
#else
|
||||||
RunningOnMono = DetectMono();
|
RunningOnMono = DetectMono();
|
||||||
RunningOnWindows = DetectWindows();
|
RunningOnWindows = DetectWindows();
|
||||||
|
|
|
@ -127,6 +127,7 @@
|
||||||
<Compile Include="Input\ButtonState.cs" />
|
<Compile Include="Input\ButtonState.cs" />
|
||||||
<Compile Include="Input\Buttons.cs" />
|
<Compile Include="Input\Buttons.cs" />
|
||||||
<Compile Include="Input\ConfigurationType.cs" />
|
<Compile Include="Input\ConfigurationType.cs" />
|
||||||
|
<Compile Include="Input\FileDropEventArgs.cs" />
|
||||||
<Compile Include="Input\GamePad.cs" />
|
<Compile Include="Input\GamePad.cs" />
|
||||||
<Compile Include="Input\GamePadAxes.cs" />
|
<Compile Include="Input\GamePadAxes.cs" />
|
||||||
<Compile Include="Input\GamePadButtons.cs" />
|
<Compile Include="Input\GamePadButtons.cs" />
|
||||||
|
@ -144,16 +145,11 @@
|
||||||
<Compile Include="Input\HatPosition.cs" />
|
<Compile Include="Input\HatPosition.cs" />
|
||||||
<Compile Include="Input\IGamePadDriver.cs" />
|
<Compile Include="Input\IGamePadDriver.cs" />
|
||||||
<Compile Include="Input\IInputDevice.cs" />
|
<Compile Include="Input\IInputDevice.cs" />
|
||||||
<Compile Include="Input\IInputDriver.cs" />
|
|
||||||
<Compile Include="Input\IInputDriver2.cs" />
|
<Compile Include="Input\IInputDriver2.cs" />
|
||||||
<Compile Include="Input\IJoystickDriver.cs" />
|
|
||||||
<Compile Include="Input\IJoystickDriver2.cs" />
|
<Compile Include="Input\IJoystickDriver2.cs" />
|
||||||
<Compile Include="Input\IKeyboardDriver.cs" />
|
|
||||||
<Compile Include="Input\IKeyboardDriver2.cs" />
|
<Compile Include="Input\IKeyboardDriver2.cs" />
|
||||||
<Compile Include="Input\IMouseDriver.cs" />
|
|
||||||
<Compile Include="Input\IMouseDriver2.cs" />
|
<Compile Include="Input\IMouseDriver2.cs" />
|
||||||
<Compile Include="Input\Joystick.cs" />
|
<Compile Include="Input\Joystick.cs" />
|
||||||
<Compile Include="Input\JoystickAxis.cs" />
|
|
||||||
<Compile Include="Input\JoystickCapabilities.cs" />
|
<Compile Include="Input\JoystickCapabilities.cs" />
|
||||||
<Compile Include="Input\JoystickDevice.cs" />
|
<Compile Include="Input\JoystickDevice.cs" />
|
||||||
<Compile Include="Input\JoystickHat.cs" />
|
<Compile Include="Input\JoystickHat.cs" />
|
||||||
|
@ -175,7 +171,6 @@
|
||||||
<Compile Include="Math\BezierCurveCubic.cs" />
|
<Compile Include="Math\BezierCurveCubic.cs" />
|
||||||
<Compile Include="Math\BezierCurveQuadric.cs" />
|
<Compile Include="Math\BezierCurveQuadric.cs" />
|
||||||
<Compile Include="Math\Box2.cs" />
|
<Compile Include="Math\Box2.cs" />
|
||||||
<Compile Include="Math\Functions.cs" />
|
|
||||||
<Compile Include="Math\Half.cs" />
|
<Compile Include="Math\Half.cs" />
|
||||||
<Compile Include="Math\MathHelper.cs" />
|
<Compile Include="Math\MathHelper.cs" />
|
||||||
<Compile Include="Math\Matrix2.cs" />
|
<Compile Include="Math\Matrix2.cs" />
|
||||||
|
@ -215,11 +210,8 @@
|
||||||
<Compile Include="Platform\EmbeddedGraphicsContext.cs" />
|
<Compile Include="Platform\EmbeddedGraphicsContext.cs" />
|
||||||
<Compile Include="Platform\Factory.cs" />
|
<Compile Include="Platform\Factory.cs" />
|
||||||
<Compile Include="Platform\IDisplayDeviceDriver.cs" />
|
<Compile Include="Platform\IDisplayDeviceDriver.cs" />
|
||||||
<Compile Include="Platform\INativeGLWindow.cs" />
|
|
||||||
<Compile Include="Platform\IPlatformFactory.cs" />
|
<Compile Include="Platform\IPlatformFactory.cs" />
|
||||||
<Compile Include="Platform\IWindowInfo.cs" />
|
<Compile Include="Platform\IWindowInfo.cs" />
|
||||||
<Compile Include="Platform\LegacyInputDriver.cs" />
|
|
||||||
<Compile Include="Platform\LegacyJoystickDriver.cs" />
|
|
||||||
<Compile Include="Platform\MappedGamePadDriver.cs" />
|
<Compile Include="Platform\MappedGamePadDriver.cs" />
|
||||||
<Compile Include="Platform\NativeWindowBase.cs" />
|
<Compile Include="Platform\NativeWindowBase.cs" />
|
||||||
<Compile Include="Platform\PlatformException.cs" />
|
<Compile Include="Platform\PlatformException.cs" />
|
||||||
|
|
|
@ -122,6 +122,7 @@
|
||||||
<Compile Include="Input\ButtonState.cs" />
|
<Compile Include="Input\ButtonState.cs" />
|
||||||
<Compile Include="Input\Buttons.cs" />
|
<Compile Include="Input\Buttons.cs" />
|
||||||
<Compile Include="Input\ConfigurationType.cs" />
|
<Compile Include="Input\ConfigurationType.cs" />
|
||||||
|
<Compile Include="Input\FileDropEventArgs.cs" />
|
||||||
<Compile Include="Input\GamePad.cs" />
|
<Compile Include="Input\GamePad.cs" />
|
||||||
<Compile Include="Input\GamePadAxes.cs" />
|
<Compile Include="Input\GamePadAxes.cs" />
|
||||||
<Compile Include="Input\GamePadButtons.cs" />
|
<Compile Include="Input\GamePadButtons.cs" />
|
||||||
|
@ -139,16 +140,11 @@
|
||||||
<Compile Include="Input\HatPosition.cs" />
|
<Compile Include="Input\HatPosition.cs" />
|
||||||
<Compile Include="Input\IGamePadDriver.cs" />
|
<Compile Include="Input\IGamePadDriver.cs" />
|
||||||
<Compile Include="Input\IInputDevice.cs" />
|
<Compile Include="Input\IInputDevice.cs" />
|
||||||
<Compile Include="Input\IInputDriver.cs" />
|
|
||||||
<Compile Include="Input\IInputDriver2.cs" />
|
<Compile Include="Input\IInputDriver2.cs" />
|
||||||
<Compile Include="Input\IJoystickDriver.cs" />
|
|
||||||
<Compile Include="Input\IJoystickDriver2.cs" />
|
<Compile Include="Input\IJoystickDriver2.cs" />
|
||||||
<Compile Include="Input\IKeyboardDriver.cs" />
|
|
||||||
<Compile Include="Input\IKeyboardDriver2.cs" />
|
<Compile Include="Input\IKeyboardDriver2.cs" />
|
||||||
<Compile Include="Input\IMouseDriver.cs" />
|
|
||||||
<Compile Include="Input\IMouseDriver2.cs" />
|
<Compile Include="Input\IMouseDriver2.cs" />
|
||||||
<Compile Include="Input\Joystick.cs" />
|
<Compile Include="Input\Joystick.cs" />
|
||||||
<Compile Include="Input\JoystickAxis.cs" />
|
|
||||||
<Compile Include="Input\JoystickCapabilities.cs" />
|
<Compile Include="Input\JoystickCapabilities.cs" />
|
||||||
<Compile Include="Input\JoystickDevice.cs" />
|
<Compile Include="Input\JoystickDevice.cs" />
|
||||||
<Compile Include="Input\JoystickHat.cs" />
|
<Compile Include="Input\JoystickHat.cs" />
|
||||||
|
@ -170,7 +166,6 @@
|
||||||
<Compile Include="Math\BezierCurveCubic.cs" />
|
<Compile Include="Math\BezierCurveCubic.cs" />
|
||||||
<Compile Include="Math\BezierCurveQuadric.cs" />
|
<Compile Include="Math\BezierCurveQuadric.cs" />
|
||||||
<Compile Include="Math\Box2.cs" />
|
<Compile Include="Math\Box2.cs" />
|
||||||
<Compile Include="Math\Functions.cs" />
|
|
||||||
<Compile Include="Math\Half.cs" />
|
<Compile Include="Math\Half.cs" />
|
||||||
<Compile Include="Math\MathHelper.cs" />
|
<Compile Include="Math\MathHelper.cs" />
|
||||||
<Compile Include="Math\Matrix2.cs" />
|
<Compile Include="Math\Matrix2.cs" />
|
||||||
|
@ -210,11 +205,8 @@
|
||||||
<Compile Include="Platform\EmbeddedGraphicsContext.cs" />
|
<Compile Include="Platform\EmbeddedGraphicsContext.cs" />
|
||||||
<Compile Include="Platform\Factory.cs" />
|
<Compile Include="Platform\Factory.cs" />
|
||||||
<Compile Include="Platform\IDisplayDeviceDriver.cs" />
|
<Compile Include="Platform\IDisplayDeviceDriver.cs" />
|
||||||
<Compile Include="Platform\INativeGLWindow.cs" />
|
|
||||||
<Compile Include="Platform\IPlatformFactory.cs" />
|
<Compile Include="Platform\IPlatformFactory.cs" />
|
||||||
<Compile Include="Platform\IWindowInfo.cs" />
|
<Compile Include="Platform\IWindowInfo.cs" />
|
||||||
<Compile Include="Platform\LegacyInputDriver.cs" />
|
|
||||||
<Compile Include="Platform\LegacyJoystickDriver.cs" />
|
|
||||||
<Compile Include="Platform\MappedGamePadDriver.cs" />
|
<Compile Include="Platform\MappedGamePadDriver.cs" />
|
||||||
<Compile Include="Platform\NativeWindowBase.cs" />
|
<Compile Include="Platform\NativeWindowBase.cs" />
|
||||||
<Compile Include="Platform\PlatformException.cs" />
|
<Compile Include="Platform\PlatformException.cs" />
|
||||||
|
|
|
@ -1128,12 +1128,6 @@ namespace OpenTK
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public OpenTK.Input.IInputDriver InputDriver {
|
|
||||||
get {
|
|
||||||
throw new NotSupportedException ();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
MouseCursor INativeWindow.Cursor
|
MouseCursor INativeWindow.Cursor
|
||||||
{
|
{
|
||||||
get { throw new NotSupportedException(); }
|
get { throw new NotSupportedException(); }
|
||||||
|
@ -1194,6 +1188,12 @@ namespace OpenTK
|
||||||
remove { throw new NotSupportedException(); }
|
remove { throw new NotSupportedException(); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
event EventHandler<FileDropEventArgs> INativeWindow.FileDrop
|
||||||
|
{
|
||||||
|
add { throw new NotSupportedException(); }
|
||||||
|
remove { throw new NotSupportedException(); }
|
||||||
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -967,14 +967,6 @@ namespace OpenTK.Platform.iPhoneOS
|
||||||
public event EventHandler<FrameEventArgs> UpdateFrame;
|
public event EventHandler<FrameEventArgs> UpdateFrame;
|
||||||
public event EventHandler<FrameEventArgs> RenderFrame;
|
public event EventHandler<FrameEventArgs> RenderFrame;
|
||||||
|
|
||||||
public OpenTK.Input.IInputDriver InputDriver
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
throw new NotSupportedException();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
MouseCursor INativeWindow.Cursor
|
MouseCursor INativeWindow.Cursor
|
||||||
{
|
{
|
||||||
get { throw new NotSupportedException(); }
|
get { throw new NotSupportedException(); }
|
||||||
|
@ -1047,6 +1039,12 @@ namespace OpenTK.Platform.iPhoneOS
|
||||||
remove { throw new NotSupportedException(); }
|
remove { throw new NotSupportedException(); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public event EventHandler<FileDropEventArgs> FileDrop
|
||||||
|
{
|
||||||
|
add { throw new NotSupportedException(); }
|
||||||
|
remove { throw new NotSupportedException(); }
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue