More iOS fixes

FNA.Core.csproj

@@ -325,6 +325,7 @@
 		<Compile Include="src\Utilities\AssemblyHelper.cs" />
 		<Compile Include="src\Utilities\FileHelpers.cs" />
 		<Compile Include="src\Utilities\FNAInternalExtensions.cs" />
+		<Compile Include="src\Utilities\XamarinHelper.cs" />
 		<Compile Include="src\Vector2.cs" />
 		<Compile Include="src\Vector3.cs" />
 		<Compile Include="src\Vector4.cs" />

FNA.csproj

@@ -393,6 +393,7 @@
     <Compile Include="src\Utilities\AssemblyHelper.cs" />
     <Compile Include="src\Utilities\FileHelpers.cs" />
     <Compile Include="src\Utilities\FNAInternalExtensions.cs" />
+    <Compile Include="src\Utilities\XamarinHelper.cs" />
     <Compile Include="src\Vector2.cs" />
     <Compile Include="src\Vector3.cs" />
     <Compile Include="src\Vector4.cs" />

FNA.dll.config

@@ -9,4 +9,10 @@
 	<dllmap dll="SDL2_image" os="osx" target="libSDL2_image-2.0.0.dylib"/>
 	<dllmap dll="SDL2_image" os="linux,freebsd,netbsd" target="libSDL2_image-2.0.so.0"/>
 	<dllmap dll="SDL2_image" os="openbsd" target="libSDL2_image.so.0"/>
+
+	<dllmap dll="SDL2"		os="osx" cpu="armv8" target="__Internal"/>
+	<dllmap dll="SDL2_image" 	os="osx" cpu="armv8" target="__Internal"/>
+	<dllmap dll="mojoshader" 	os="osx" cpu="armv8" target="__Internal"/>
+	<dllmap dll="FAudio"		os="osx" cpu="armv8" target="__Internal"/>
+	<dllmap dll="libtheorafile"	os="osx" cpu="armv8" target="__Internal"/>
 </configuration>

src/FNAPlatform/OpenGLDevice.cs

@@ -523,6 +523,7 @@ public VertexAttribute()
 
 		private bool effectApplied = false;
 
+		[ObjCRuntime.MonoPInvokeCallback(typeof(MojoShader.MOJOSHADER_glGetProcAddress))]
 		private static IntPtr glGetProcAddress(IntPtr name, IntPtr d)
 		{
 			return SDL.SDL_GL_GetProcAddress(name);
@@ -607,6 +608,7 @@ GraphicsAdapter adapter
 
 			// UIKit needs special treatment for backbuffer behavior
 			SDL.SDL_SysWMinfo wmInfo = new SDL.SDL_SysWMinfo();
+			SDL.SDL_VERSION(out wmInfo.version);
 			SDL.SDL_GetWindowWMInfo(
 				presentationParameters.DeviceWindowHandle,
 				ref wmInfo

src/FrameworkDispatcher.cs

@@ -12,7 +12,7 @@
 
 using Microsoft.Xna.Framework.Audio;
 using Microsoft.Xna.Framework.Input.Touch;
-using Microsoft.Xna.Framework.Media;
+using MediaPlayer = Microsoft.Xna.Framework.Media.MediaPlayer;
 #endregion
 
 namespace Microsoft.Xna.Framework

src/Utilities/XamarinHelper.cs

@@ -0,0 +1,25 @@
+#region License
+/* FNA - XNA4 Reimplementation for Desktop Platforms
+ * Copyright 2009-2018 Ethan Lee and the MonoGame Team
+ *
+ * Released under the Microsoft Public License.
+ * See LICENSE for details.
+ */
+#endregion
+
+#region Using Statements
+using System;
+#endregion
+
+// This is a dummy namespace needed for Xamarin iOS/tvOS AOT compilation
+namespace ObjCRuntime
+{
+	[AttributeUsage(AttributeTargets.Method)]
+	class MonoPInvokeCallbackAttribute : Attribute
+	{
+		public MonoPInvokeCallbackAttribute(Type t)
+		{
+
+		}
+	}
+}