Merge pull request #4803 from cra0zy/macfix

Remove pointless Mac defines and code
MonoGame · Apr 25, 2016 · 43b70d3 · 43b70d3
2 parents b6f01ad + 17c573d
commit 43b70d3
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 52 deletions.
diff --git a/Build/Projects/MonoGame.Framework.definition b/Build/Projects/MonoGame.Framework.definition
@@ -791,7 +791,7 @@
     <Compile Include="Input\ButtonState.cs" />
     <Compile Include="Input\GamePad.cs" />
     <Compile Include="Input\GamePad.Default.cs">
-      <Platforms>Android,MacOS,WindowsPhone,WindowsPhone81</Platforms>
+      <Platforms>Android,WindowsPhone,WindowsPhone81</Platforms>
     </Compile>
     <Compile Include="Input\GamePad.IOS.cs">
       <Platforms>iOS</Platforms>
@@ -835,9 +835,6 @@
     <Compile Include="Input\Joystick.SDL.cs">
       <Platforms>Linux,WindowsGL</Platforms>
     </Compile>
-    <Compile Include="Input\Joystick.MacOS.cs">
-      <Platforms>MacOS</Platforms>
-    </Compile>
     <Compile Include="Input\Joystick.Web.cs">
       <Platforms>Web</Platforms>
     </Compile>

diff --git a/MonoGame.Framework/Input/GamePad.Default.cs b/MonoGame.Framework/Input/GamePad.Default.cs
@@ -2,8 +2,6 @@
 // This file is subject to the terms and conditions defined in
 // file 'LICENSE.txt', which is part of this source code package.
 
-#if !MONOMAC || PLATFORM_MACOS_LEGACY
-
 namespace Microsoft.Xna.Framework.Input
 {
     static partial class GamePad
@@ -47,5 +45,3 @@ private static bool PlatformSetVibration(int index, float leftMotor, float right
     }
 }
 
-#endif
-
diff --git a/MonoGame.Framework/Input/GamePad.MacOS.cs b/MonoGame.Framework/Input/GamePad.MacOS.cs
@@ -4,8 +4,6 @@
 
 using System;
 
-#if !PLATFORM_MACOS_LEGACY
-
 namespace Microsoft.Xna.Framework.Input
 {
     /// <summary> 
@@ -35,4 +33,3 @@ private static bool PlatformSetVibration(int index, float leftMotor, float right
     }
 }
 
-#endif
diff --git a/MonoGame.Framework/Input/Joystick.Default.cs b/MonoGame.Framework/Input/Joystick.Default.cs
@@ -2,8 +2,6 @@
 // This file is subject to the terms and conditions defined in
 // file 'LICENSE.txt', which is part of this source code package.
 
-#if !MONOMAC || PLATFORM_MACOS_LEGACY
-
 using System;
 
 namespace Microsoft.Xna.Framework.Input
@@ -34,5 +32,3 @@ private static JoystickState PlatformGetState(int index)
     }
 }
 
-#endif
-
diff --git a/MonoGame.Framework/Input/Joystick.MacOS.cs b/MonoGame.Framework/Input/Joystick.MacOS.cs