From 3686203a6a675ac41ac879c2105bb09180db4d7a Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Wed, 19 Jul 2017 00:24:43 -0700
Subject: [PATCH] Fix broken Android and iOS builds
---
src/OpenTK/Configuration.cs | 2 +-
src/OpenTK/OpenTK.Android.csproj | 10 +---------
src/OpenTK/OpenTK.iOS.csproj | 10 +---------
src/OpenTK/Platform/Android/GameViewBase.cs | 12 ++++++------
src/OpenTK/Platform/iPhoneOS/iPhoneOSGameView.cs | 14 ++++++--------
5 files changed, 15 insertions(+), 33 deletions(-)
diff --git a/src/OpenTK/Configuration.cs b/src/OpenTK/Configuration.cs
index d277d0e0..6c3a9a57 100644
--- a/src/OpenTK/Configuration.cs
+++ b/src/OpenTK/Configuration.cs
@@ -281,7 +281,7 @@ namespace OpenTK
if (!initialized)
{
#if ANDROID || IPHONE
- runningOnMono = true;
+ RunningOnMono = true;
#else
RunningOnMono = DetectMono();
RunningOnWindows = DetectWindows();
diff --git a/src/OpenTK/OpenTK.Android.csproj b/src/OpenTK/OpenTK.Android.csproj
index 4740ea97..a0556c2e 100644
--- a/src/OpenTK/OpenTK.Android.csproj
+++ b/src/OpenTK/OpenTK.Android.csproj
@@ -127,6 +127,7 @@
<Compile Include="Input\ButtonState.cs" />
<Compile Include="Input\Buttons.cs" />
<Compile Include="Input\ConfigurationType.cs" />
+ <Compile Include="Input\FileDropEventArgs.cs" />
<Compile Include="Input\GamePad.cs" />
<Compile Include="Input\GamePadAxes.cs" />
<Compile Include="Input\GamePadButtons.cs" />
@@ -144,16 +145,11 @@
<Compile Include="Input\HatPosition.cs" />
<Compile Include="Input\IGamePadDriver.cs" />
<Compile Include="Input\IInputDevice.cs" />
- <Compile Include="Input\IInputDriver.cs" />
<Compile Include="Input\IInputDriver2.cs" />
- <Compile Include="Input\IJoystickDriver.cs" />
<Compile Include="Input\IJoystickDriver2.cs" />
- <Compile Include="Input\IKeyboardDriver.cs" />
<Compile Include="Input\IKeyboardDriver2.cs" />
- <Compile Include="Input\IMouseDriver.cs" />
<Compile Include="Input\IMouseDriver2.cs" />
<Compile Include="Input\Joystick.cs" />
- <Compile Include="Input\JoystickAxis.cs" />
<Compile Include="Input\JoystickCapabilities.cs" />
<Compile Include="Input\JoystickDevice.cs" />
<Compile Include="Input\JoystickHat.cs" />
@@ -175,7 +171,6 @@
<Compile Include="Math\BezierCurveCubic.cs" />
<Compile Include="Math\BezierCurveQuadric.cs" />
<Compile Include="Math\Box2.cs" />
- <Compile Include="Math\Functions.cs" />
<Compile Include="Math\Half.cs" />
<Compile Include="Math\MathHelper.cs" />
<Compile Include="Math\Matrix2.cs" />
@@ -215,11 +210,8 @@
<Compile Include="Platform\EmbeddedGraphicsContext.cs" />
<Compile Include="Platform\Factory.cs" />
<Compile Include="Platform\IDisplayDeviceDriver.cs" />
- <Compile Include="Platform\INativeGLWindow.cs" />
<Compile Include="Platform\IPlatformFactory.cs" />
<Compile Include="Platform\IWindowInfo.cs" />
- <Compile Include="Platform\LegacyInputDriver.cs" />
- <Compile Include="Platform\LegacyJoystickDriver.cs" />
<Compile Include="Platform\MappedGamePadDriver.cs" />
<Compile Include="Platform\NativeWindowBase.cs" />
<Compile Include="Platform\PlatformException.cs" />
diff --git a/src/OpenTK/OpenTK.iOS.csproj b/src/OpenTK/OpenTK.iOS.csproj
index b8051694..9054b11e 100644
--- a/src/OpenTK/OpenTK.iOS.csproj
+++ b/src/OpenTK/OpenTK.iOS.csproj
@@ -122,6 +122,7 @@
<Compile Include="Input\ButtonState.cs" />
<Compile Include="Input\Buttons.cs" />
<Compile Include="Input\ConfigurationType.cs" />
+ <Compile Include="Input\FileDropEventArgs.cs" />
<Compile Include="Input\GamePad.cs" />
<Compile Include="Input\GamePadAxes.cs" />
<Compile Include="Input\GamePadButtons.cs" />
@@ -139,16 +140,11 @@
<Compile Include="Input\HatPosition.cs" />
<Compile Include="Input\IGamePadDriver.cs" />
<Compile Include="Input\IInputDevice.cs" />
- <Compile Include="Input\IInputDriver.cs" />
<Compile Include="Input\IInputDriver2.cs" />
- <Compile Include="Input\IJoystickDriver.cs" />
<Compile Include="Input\IJoystickDriver2.cs" />
- <Compile Include="Input\IKeyboardDriver.cs" />
<Compile Include="Input\IKeyboardDriver2.cs" />
- <Compile Include="Input\IMouseDriver.cs" />
<Compile Include="Input\IMouseDriver2.cs" />
<Compile Include="Input\Joystick.cs" />
- <Compile Include="Input\JoystickAxis.cs" />
<Compile Include="Input\JoystickCapabilities.cs" />
<Compile Include="Input\JoystickDevice.cs" />
<Compile Include="Input\JoystickHat.cs" />
@@ -170,7 +166,6 @@
<Compile Include="Math\BezierCurveCubic.cs" />
<Compile Include="Math\BezierCurveQuadric.cs" />
<Compile Include="Math\Box2.cs" />
- <Compile Include="Math\Functions.cs" />
<Compile Include="Math\Half.cs" />
<Compile Include="Math\MathHelper.cs" />
<Compile Include="Math\Matrix2.cs" />
@@ -210,11 +205,8 @@
<Compile Include="Platform\EmbeddedGraphicsContext.cs" />
<Compile Include="Platform\Factory.cs" />
<Compile Include="Platform\IDisplayDeviceDriver.cs" />
- <Compile Include="Platform\INativeGLWindow.cs" />
<Compile Include="Platform\IPlatformFactory.cs" />
<Compile Include="Platform\IWindowInfo.cs" />
- <Compile Include="Platform\LegacyInputDriver.cs" />
- <Compile Include="Platform\LegacyJoystickDriver.cs" />
<Compile Include="Platform\MappedGamePadDriver.cs" />
<Compile Include="Platform\NativeWindowBase.cs" />
<Compile Include="Platform\PlatformException.cs" />
diff --git a/src/OpenTK/Platform/Android/GameViewBase.cs b/src/OpenTK/Platform/Android/GameViewBase.cs
index 9ccdab9b..5d8c21f2 100644
--- a/src/OpenTK/Platform/Android/GameViewBase.cs
+++ b/src/OpenTK/Platform/Android/GameViewBase.cs
@@ -1128,12 +1128,6 @@ namespace OpenTK
}
}
- public OpenTK.Input.IInputDriver InputDriver {
- get {
- throw new NotSupportedException ();
- }
- }
-
MouseCursor INativeWindow.Cursor
{
get { throw new NotSupportedException(); }
@@ -1194,6 +1188,12 @@ namespace OpenTK
remove { throw new NotSupportedException(); }
}
+ event EventHandler<FileDropEventArgs> INativeWindow.FileDrop
+ {
+ add { throw new NotSupportedException(); }
+ remove { throw new NotSupportedException(); }
+ }
+
#endregion
}
}
diff --git a/src/OpenTK/Platform/iPhoneOS/iPhoneOSGameView.cs b/src/OpenTK/Platform/iPhoneOS/iPhoneOSGameView.cs
index 35cecbdb..ea42e3ca 100644
--- a/src/OpenTK/Platform/iPhoneOS/iPhoneOSGameView.cs
+++ b/src/OpenTK/Platform/iPhoneOS/iPhoneOSGameView.cs
@@ -967,14 +967,6 @@ namespace OpenTK.Platform.iPhoneOS
public event EventHandler<FrameEventArgs> UpdateFrame;
public event EventHandler<FrameEventArgs> RenderFrame;
- public OpenTK.Input.IInputDriver InputDriver
- {
- get
- {
- throw new NotSupportedException();
- }
- }
-
MouseCursor INativeWindow.Cursor
{
get { throw new NotSupportedException(); }
@@ -1047,6 +1039,12 @@ namespace OpenTK.Platform.iPhoneOS
remove { throw new NotSupportedException(); }
}
+ public event EventHandler<FileDropEventArgs> FileDrop
+ {
+ add { throw new NotSupportedException(); }
+ remove { throw new NotSupportedException(); }
+ }
+
}
}