Fix broken Android and iOS builds

diff --git a/src/OpenTK/Configuration.cs b/src/OpenTK/Configuration.cs
index d277d0e0526fac7acdf9a48010521f1651c92a9c..6c3a9a579fff166ef80d17c38301cf9b630f6d0b 100644 (file)
--- 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 4740ea97944f195cf1a71130f07198eb244ef938..a0556c2e92c67319ed8308645f5ee14c528f8094 100644 (file)
--- 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 b8051694727f625590d5fb3a60eb507a5872f1d6..9054b11eb2a30fc1c18d7d29896072fedbba8107 100644 (file)
--- 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 9ccdab9b08d5a02c8243a2c1271866541a1a52a8..5d8c21f2e25296d9853d57e9fc030bd605f8c514 100644 (file)
--- 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 35cecbdbdda0d7a01608a1b7d0b8b856a473474a..ea42e3cab0149310d6ab0a6a3bde6da036483ef9 100644 (file)
--- 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(); }
+        }
+
     }
 }