Great Samples reorganization, part 3

BouncingBox/MonoGame.Samples.BouncingBox.iOS.csproj

@@ -15,7 +15,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
+    <DefineConstants>IPHONE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <MtouchLink>None</MtouchLink>
@@ -33,13 +33,14 @@
     <MtouchI18n />
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <AssemblyName>BouncingBox</AssemblyName>
+    <DefineConstants>IPHONE;</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\iPhone\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
+    <DefineConstants>IPHONE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
@@ -60,6 +61,7 @@
     <MtouchSdkVersion>4.0</MtouchSdkVersion>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <AssemblyName>BouncingBox</AssemblyName>
+    <DefineConstants>IPHONE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>none</DebugType>

BouncingBox/main.cs

@@ -1,8 +1,14 @@
+#if MONOMAC
 using MonoMac.AppKit;
 using MonoMac.Foundation;
+#elif IPHONE
+using MonoTouch.Foundation;
+using MonoTouch.UIKit;
+#endif
 
 namespace Microsoft.Xna.Samples.BouncingBox
 {
+#if MONOMAC
 	class Program
 	{
 		static void Main (string[] args)
@@ -35,5 +41,24 @@ namespace Microsoft.Xna.Samples.BouncingBox
 		{
 			return true;
 		}
-	}	
+	}
+#elif IPHONE
+	[Register ("AppDelegate")]
+	class Program : UIApplicationDelegate 
+	{
+		private Game1 game;
+
+		public override void FinishedLaunching (UIApplication app)
+		{
+			// Fun begins..
+			game = new Game1();
+			game.Run();
+		}
+
+		static void Main (string [] args)
+		{
+			UIApplication.Main (args,null,"AppDelegate");
+		}
+	}
+#endif
 }

CatapaultWars/CatapaultGame.MacOS.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG; MACOS</DefineConstants>
+    <DefineConstants>DEBUG; MONOMAC</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>

CatapaultWars/CatapultGame.cs

@@ -49,7 +49,7 @@ namespace CatapultGame
             screenManager = new ScreenManager(this);
             Components.Add(screenManager);
 			IsMouseVisible = true;
-#if !WINDOWS && !XBOX && !MACOS
+#if !WINDOWS && !XBOX && !MONOMAC
             //Switch to full screen for best game experience
             graphics.IsFullScreen = true;
 #endif

CatapaultWars/MonoGame.Samples.CatapultWars.iOS.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
-    <DefineConstants>DEBUG; IOS</DefineConstants>
+    <DefineConstants>DEBUG; IPHONE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -65,7 +65,9 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.iOS.plist"><Link>Info.plist</Link></None>
+    <None Include="Info.iOS.plist">
+      <Link>Info.plist</Link>
+    </None>
     <None Include="Content\Fonts\HUDFont.xnb">
       <Link>Content\Fonts\HUDFont.xnb</Link>
     </None>
@@ -140,7 +142,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Main.cs" />
     <Compile Include="CatapultGame.cs">
       <Link>CatapultGame.cs</Link>
     </Compile>
@@ -201,6 +202,7 @@
     <Compile Include="Utility\AudioManager.cs">
       <Link>Utility\AudioManager.cs</Link>
     </Compile>
+    <Compile Include="Program.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>

CatapaultWars/Program.cs

@@ -9,6 +9,12 @@
 
 #region Using Statements
 using System;
+
+#if IPHONE
+using MonoTouch.Foundation;
+using MonoTouch.UIKit;
+#endif
+
 #endregion
 
 namespace CatapultGame
@@ -27,7 +33,7 @@ namespace CatapultGame
             }
         }
     }
-#elif MACOS
+#elif MONOMAC
 
 
 	static class Program
@@ -61,6 +67,27 @@ namespace CatapultGame
 			return true;
 		}
 	}
+#elif IPHONE
+	[Register ("AppDelegate")]
+	class Program : UIApplicationDelegate 
+	{
+		private CatapultGame game;
+
+		public override void FinishedLaunching (UIApplication app)
+		{
+			// Fun begins..
+			game = new CatapultGame();
+			game.Run();
+		}
+		
+		// This is the main entry point of the application.
+		static void Main (string[] args)
+		{
+			// if you want to use a different Application Delegate class from "AppDelegate"
+			// you can specify it here.
+			UIApplication.Main (args, null, "AppDelegate");
+		}
+	}
 #endif
 
 }

CatapaultWars/Screens/GameplayScreen.cs

@@ -82,7 +82,7 @@ namespace CatapultGame
         public override void LoadContent()
         {
             base.LoadContent();
-#if ANDROID || IOS			
+#if ANDROID || IPHONE			
 			LoadAssets();
 #endif			
             // Start the game

CatapaultWars/Screens/InstructionsScreen.cs

@@ -19,12 +19,12 @@ using Microsoft.Xna.Framework;
 using GameStateManagement;
 using Microsoft.Xna.Framework.Input.Touch;
 
-#if MACOS
+#if MONOMAC
 using MonoMac.AppKit;
 using MonoMac.Foundation;
 #endif
 
-#if IOS
+#if IPHONE
 using MonoTouch.UIKit;
 using MonoTouch.Foundation;
 #endif
@@ -81,7 +81,7 @@ namespace CatapultGame
 		public override void HandleInput (InputState input)
 		{
 			if (isLoading == true) {
-#if ANDROID || IOS
+#if ANDROID || IPHONE
 				// Exit the screen and show the gameplay screen 
 					// with pre-loaded assets
 				ExitScreen ();
@@ -100,7 +100,7 @@ namespace CatapultGame
 				gameplayScreen.ScreenManager = ScreenManager;
 
 				// Start loading the resources in additional thread
-#if MACOS
+#if MONOMAC
 				// create a new thread using BackgroundWorkerThread as method to execute
 				thread = new Thread (LoadAssetsWorkerThread as ThreadStart);
 #else
@@ -118,7 +118,7 @@ namespace CatapultGame
 					gameplayScreen = new GameplayScreen ();
 					gameplayScreen.ScreenManager = ScreenManager;
 					
-#if ANDROID || IOS	
+#if ANDROID || IPHONE	
 					isLoading = true;									
 #else				
 					// Start loading the resources in additional thread
@@ -136,22 +136,22 @@ namespace CatapultGame
 		void LoadAssetsWorkerThread ()
 		{
 
-#if MACOS || IOS			
+#if MONOMAC || IPHONE			
 			// Create an Autorelease Pool or we will leak objects.
 			using (var pool = new NSAutoreleasePool()) {
 #else				
 				
 #endif				
 				// Make sure we invoke this on the Main Thread or OpenGL will throw an error
-#if MACOS
+#if MONOMAC
 				MonoMac.AppKit.NSApplication.SharedApplication.BeginInvokeOnMainThread (delegate {
 #endif
-#if IOS
+#if IPHONE
 				var invokeOnMainThredObj = new NSObject();
 				invokeOnMainThredObj.InvokeOnMainThread(delegate {
 #endif
 					gameplayScreen.LoadAssets ();
-#if MACOS || IOS						
+#if MONOMAC || IPHONE						
 				});
 					
 			}				

CatapultNetWars/CatapultGame.cs

@@ -75,7 +75,7 @@ namespace CatapultGame
 			NetworkSession.InviteAccepted += (sender, e) => NetworkSessionComponent.InviteAccepted (screenManager, e);
 
 			IsMouseVisible = true;
-#if !WINDOWS && !XBOX && !MACOS && !LINUX
+#if !WINDOWS && !XBOX && !MONOMAC && !LINUX
 			//Switch to full screen for best game experience
 			graphics.IsFullScreen = true;
 #else

CatapultNetWars/CatapultNetWars.MacOS.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG; MACOS</DefineConstants>
+    <DefineConstants>DEBUG; MONOMAC</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>

CatapultNetWars/MonoGame.Samples.CatapultNetWars.iOS.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
-    <DefineConstants>DEBUG;IOS</DefineConstants>
+    <DefineConstants>DEBUG;IPHONE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -33,13 +33,14 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <MtouchLink>None</MtouchLink>
+    <DefineConstants>IPHONE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\iPhone\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
+    <DefineConstants>DEBUG;IPHONE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -55,6 +56,7 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <CodesignKey>iPhone Developer</CodesignKey>
+    <DefineConstants>IPHONE</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -65,7 +67,9 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.iOS.plist"><Link>Info.plist</Link></None>
+    <None Include="Info.iOS.plist">
+      <Link>Info.plist</Link>
+    </None>
     <None Include="Resources.resources">
       <Link>Resources.resources</Link>
     </None>
@@ -74,7 +78,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Main.cs" />
     <Compile Include="CatapultGame.cs">
       <Link>CatapultGame.cs</Link>
     </Compile>
@@ -177,6 +180,7 @@
     <Compile Include="Resources.Designer.cs">
       <Link>Resources.Designer.cs</Link>
     </Compile>
+    <Compile Include="Program.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
@@ -305,7 +309,7 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
       <Project>{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}</Project>
       <Name>MonoGame.Framework.iOS</Name>
     </ProjectReference>

CatapultNetWars/Program.cs

@@ -9,6 +9,12 @@
 
 #region Using Statements
 using System;
+
+#if IPHONE
+using MonoTouch.Foundation;
+using MonoTouch.UIKit;
+#endif
+
 #endregion
 
 namespace CatapultGame
@@ -27,9 +33,7 @@ namespace CatapultGame
             }
         }
     }
-#elif MACOS
-
-
+#elif MONOMAC
 	static class Program
 	{	
 		/// <summary>
@@ -60,6 +64,27 @@ namespace CatapultGame
 			return true;
 		}
 	}
+#elif IPHONE
+	[Register ("AppDelegate")]
+	class Program : UIApplicationDelegate 
+	{
+		private CatapultGame game;
+
+		public override void FinishedLaunching (UIApplication app)
+		{
+			// Fun begins..
+			game = new CatapultGame();
+			game.Run();
+		}
+		
+		// This is the main entry point of the application.
+		static void Main (string[] args)
+		{
+			// if you want to use a different Application Delegate class from "AppDelegate"
+			// you can specify it here.
+			UIApplication.Main (args, null, "AppDelegate");
+		}
+	}
 #endif
 
 }

CatapultNetWars/Screens/GameplayScreen.cs

@@ -99,7 +99,7 @@ namespace CatapultGame
 		public override void LoadContent ()
 		{
 			base.LoadContent ();
-#if ANDROID || IOS || LINUX || WINDOWS
+#if ANDROID || IPHONE || LINUX || WINDOWS
 			LoadAssets();
 #endif			
 			// Start the game

CatapultNetWars/Screens/InstructionsScreen.cs

@@ -19,12 +19,12 @@ using Microsoft.Xna.Framework;
 using GameStateManagement;
 using Microsoft.Xna.Framework.Input.Touch;
 
-#if MACOS
+#if MONOMAC
 using MonoMac.AppKit;
 using MonoMac.Foundation;
 #endif
 
-#if IOS
+#if IPHONE
 using MonoTouch.UIKit;
 using MonoTouch.Foundation;
 #endif
@@ -84,7 +84,7 @@ namespace CatapultGame
 		{
 			if (isLoading == true)
             {
-#if ANDROID || IOS || LINUX || WINDOWS
+#if ANDROID || IPHONE || LINUX || WINDOWS
                 // Exit the screen and show the gameplay screen 
 					// with pre-loaded assets
 				ExitScreen ();
@@ -104,7 +104,7 @@ namespace CatapultGame
 
                 // Start loading the resources in additional thread
 #if !LINUX && !WINDOWS
-#if MACOS
+#if MONOMAC
 				// create a new thread using BackgroundWorkerThread as method to execute
 				thread = new Thread (LoadAssetsWorkerThread as ThreadStart);
 #else     
@@ -124,7 +124,7 @@ namespace CatapultGame
 					gameplayScreen = new GameplayScreen ();
 					gameplayScreen.ScreenManager = ScreenManager;
 
-#if ANDROID || IOS	|| LINUX || WINDOWS
+#if ANDROID || IPHONE	|| LINUX || WINDOWS
                     isLoading = true;									
 #else						
 					// Start loading the resources in additional thread
@@ -142,22 +142,22 @@ namespace CatapultGame
 		{
 
 
-#if MACOS || IOS			
+#if MONOMAC || IPHONE			
 			// Create an Autorelease Pool or we will leak objects.
 			using (var pool = new NSAutoreleasePool()) {
 #else				
 				
 #endif
 				// Make sure we invoke this on the Main Thread or OpenGL will throw an error
-#if MACOS
+#if MONOMAC
 				MonoMac.AppKit.NSApplication.SharedApplication.BeginInvokeOnMainThread (delegate {
 #endif
-#if IOS
+#if IPHONE
 				var invokeOnMainThredObj = new NSObject();
 				invokeOnMainThredObj.InvokeOnMainThread(delegate {
 #endif
 					gameplayScreen.LoadAssets ();
-#if MACOS || IOS						
+#if MONOMAC || IPHONE						
 				});
 					
 			}				

ChaseAndEvade/MonoGame.Samples.ChaseAndEvade.iOS.csproj

@@ -88,8 +88,8 @@
     <Reference Include="OpenTK" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Main.cs" />
     <Compile Include="ChaseAndEvadeGame.cs" />
+    <Compile Include="Program.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Content\" />
@@ -114,7 +114,9 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="GameThumbnail.png" />
-    <None Include="Info.iOS.plist"><Link>Info.plist</Link></None>
+    <None Include="Info.iOS.plist">
+      <Link>Info.plist</Link>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">

ChaseAndEvade/Program.cs

@@ -1,8 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+#if MONOMAC
 using MonoMac.AppKit;
 using MonoMac.Foundation;
+#elif IPHONE
+using MonoTouch.Foundation;
+using MonoTouch.UIKit;
+#endif
 
 namespace ChaseAndEvade
 {
+#if MONOMAC
 	class Program
 	{
 		static void Main (string[] args)
@@ -24,16 +33,51 @@ namespace ChaseAndEvade
 
 	class AppDelegate : NSApplicationDelegate
 	{
-        ChaseAndEvadeGame game;
+		ChaseAndEvadeGame game;
 		public override void FinishedLaunching (MonoMac.Foundation.NSObject notification)
 		{
 			game = new ChaseAndEvadeGame();
-		    game.Run();
+			game.Run();
 		}
 
 		public override bool ApplicationShouldTerminateAfterLastWindowClosed (NSApplication sender)
 		{
 			return true;
 		}
+	}
+#elif IPHONE
+	[Register("AppDelegate")]
+	class Program : UIApplicationDelegate
+	{
+		ChaseAndEvadeGame game;
+		public override void FinishedLaunching(UIApplication app)
+		{
+			// Fun begins..
+			game = new ChaseAndEvadeGame();
+			game.Run();
+		}
+
+		/// <summary>
+		/// The main entry point for the application.
+		/// </summary>
+		static void Main(string[] args)
+		{
+			UIApplication.Main(args, null, "AppDelegate");
+		}
+	}	
+#else
+	/// <summary>
+	/// The main entry point for the application.
+	/// </summary>
+	static class Program
+	{
+		static void Main()
+		{
+			using (ChaseAndEvadeGame game = new ChaseAndEvadeGame())
+			{
+				game.Run();
+			}
+		}
 	}	
+#endif
 }

CollisionSample/CollisionSample.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG; MAC</DefineConstants>
+    <DefineConstants>DEBUG; MONOMAC</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>

CollisionSample/Program.cs

@@ -26,7 +26,7 @@ namespace CollisionSample
         }
     }
 #endif
-#if MAC
+#if MONOMAC
 
 	static class Program
 	{	

Colored3DCube/Colored3DCube.MacOS.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG; MAC</DefineConstants>
+    <DefineConstants>DEBUG; MONOMAC</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>

Colored3DCube/Program.cs

@@ -17,7 +17,7 @@ namespace Colored3DCube
         }
     }
 #endif
-#if MAC
+#if MONOMAC
 
 	static class Program
 	{	

GameStateManagement/Game.cs

@@ -12,7 +12,7 @@ using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 #endregion
 
-namespace Microsoft.Xna.Samples.GameStateManagement
+namespace GameStateManagement
 {
     /// <summary>
     /// Sample showing how to manage different game states, with transitions

GameStateManagement/GameStateManagement.MacOS.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
+    <DefineConstants>DEBUG;MONOMAC</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -28,6 +28,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
+    <DefineConstants>MONOMAC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -38,7 +39,8 @@
     <Reference Include="MonoMac" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist"></None>
+    <None Include="Info.plist">
+    </None>
     <None Include="Background.png" />
     <None Include="Game.ico" />
     <None Include="Content\background.png" />
@@ -64,6 +66,7 @@
     <Compile Include="Screens\OptionsMenuScreen.cs" />
     <Compile Include="Screens\PauseMenuScreen.cs" />
     <Compile Include="Screens\PlayerIndexEventArgs.cs" />
+    <Compile Include="Program.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">

GameStateManagement/Program.cs

@@ -9,7 +9,7 @@ using Microsoft.Xna.Framework.Media;
 #endif
 #endregion
 
-namespace Microsoft.Xna.Samples.GameStateManagement
+namespace GameStateManagement
 {
     #region Entry Point
 #if IPHONE

HoneycombRush/HoneycombRush.MacOS.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG; MAC</DefineConstants>
+    <DefineConstants>DEBUG; MONOMAC</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>

HoneycombRush/HoneycombRush.cs

@@ -56,7 +56,7 @@ namespace HoneycombRush
             graphics.IsFullScreen = true;
 
             screenManager = new ScreenManager(this, Vector2.One);
-#elif WINDOWS || MAC || LINUX
+#elif WINDOWS || MONOMAC || LINUX
             graphics.PreferredBackBufferHeight = 480;
             graphics.PreferredBackBufferWidth = 800;            
 

HoneycombRush/Program.cs

@@ -29,7 +29,7 @@ namespace HoneycombRush
             }
         }
     }
-#elif MAC
+#elif MONOMAC
 	static class Program
 	{
 		/// <summary>

HoneycombRush/Screens/GameplayScreen.cs

@@ -20,7 +20,7 @@ using HoneycombRush.GameDebugTools;
 using Microsoft.Xna.Framework.Input.Touch;
 using System.Xml.Linq;
 
-#if MAC
+#if MONOMAC
 using MonoMac.Foundation;
 #endif
 

HoneycombRush/Screens/LevelOverScreen.cs

@@ -251,7 +251,7 @@ namespace HoneycombRush
             // If not already loading
             else if (!isLoading)
             {
-#if MAC			
+#if MONOMAC			
 		// Start loading the resources on main thread
 		// If not then all sorts of errors happen for 
 		// AutoReleasPools and OpenGL does not handle 

HoneycombRush/Screens/LoadingAndInstructionScreen.cs

@@ -189,7 +189,7 @@ namespace HoneycombRush
         private void LoadResources()
         {
 
-#if MAC		
+#if MONOMAC		
 		// Start loading the resources on main thread
 		// If not then all sorts of errors happen for 
 		// AutoReleasPools and OpenGL does not handle 

Particle3DSample/Content/ParticlePixelShader.fsh

@@ -1,6 +0,0 @@
-uniform sampler2D Texture;
-
-void main()
-{
-	gl_FragColor = gl_Color * texture2D(Texture, gl_TexCoord[0].xy);
-}

Particle3DSample/Content/ParticlePixelShader.vsh

@@ -1,51 +0,0 @@
-uniform sampler2D Texture;
-
-// Camera parameters.
-uniform mat4 View;
-uniform mat4 Projection;
-uniform vec2 ViewportScale;
-
-
-// The current time, in seconds.
-uniform float CurrentTime;
-
-
-// Parameters describing how the particles animate.
-uniform float Duration;
-uniform float DurationRandomness;
-uniform vec3 Gravity;
-uniform float EndVelocity;
-uniform vec4 MinColor;
-uniform vec4 MaxColor;
-
-
-// These float2 parameters describe the min and max of a range.
-// The actual value is chosen differently for each particle,
-// interpolating between x and y by some random amount.
-uniform vec2 RotateSpeed;
-uniform vec2 StartSize;
-uniform vec2 EndSize;
-
-void main()
-{
-	mat4 view = View;
-	mat4 projection = Projection;
-	vec2 viewportScale = ViewportScale;
-	
-	float currentTime = CurrentTime;
-	
-	float duration = Duration;
-	float durationRandomness = DurationRandomness;
-	vec3 gravity = Gravity;
-	float endVelocity = EndVelocity;
-	vec4 minColor = MinColor;
-	vec4 maxColor = MaxColor;
-	
-	vec2 rotateSpeed = RotateSpeed;
-	vec2 startSize = StartSize;
-	vec2 endSize = EndSize;
-	
-	gl_FrontColor = gl_Color;
-	gl_TexCoord[0] = gl_MultiTexCoord0;
-	gl_Position = ftransform();
-}

Particle3DSample/Particle3DSample.MacOS.csproj

@@ -38,7 +38,10 @@
     <Reference Include="MonoMac" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist"></None>
+    <None Include="Info.plist">
+    </None>
+    <None Include="Content\Particle3DSampleContent.contentproj" />
+    <None Include="Content\ParticleEffect.fx" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
@@ -59,15 +62,12 @@
     <Compile Include="ParticleSystem.cs" />
     <Compile Include="ParticleVertex.cs" />
     <Compile Include="Projectile.cs" />
-    <Compile Include="ParticleEffect.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Content\font.xnb" />
     <Content Include="Content\ExplosionSettings.xml" />
     <Content Include="Content\ExplosionSmokeSettings.xml" />
     <Content Include="Content\FireSettings.xml" />
-    <Content Include="Content\Particle3DSampleContent.contentproj" />
-    <Content Include="Content\ParticleEffect.fx" />
     <Content Include="Content\ProjectileTrailSettings.xml" />
     <Content Include="Content\SmokePlumeSettings.xml" />
     <Content Include="Content\checker.bmp" />
@@ -89,8 +89,6 @@
     <Content Include="Content\ProjectileTrailSettings.xnb" />
     <Content Include="Content\smoke.xnb" />
     <Content Include="Content\SmokePlumeSettings.xnb" />
-    <Content Include="Content\ParticlePixelShader.fsh" />
-    <Content Include="Content\ParticlePixelShader.vsh" />
     <Content Include="Content\explosion.xnb" />
   </ItemGroup>
 </Project>

Particle3DSample/ParticleEffect.cs

@@ -1,100 +0,0 @@
-using System;
-using System.IO;
-using System.Text;
-
-using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework;
-
-using MonoMac.Foundation;
-using MonoMac.AppKit;
-
-namespace Particle3DSample
-{
-	public class ParticleEffect : Effect
-	{
-		public ParticleEffect (GraphicsDevice graphicsDevice) : base (graphicsDevice)
-		{
-			// We do not need this but here for test
-			LoadVertexShaderFromFile ("ParticlePixelShader.vsh");
-			LoadFragmentShaderFromFile ("ParticlePixelShader.fsh");
-			
-			DefineTechnique ("Particles", "P0", 0, 0);
-			CurrentTechnique = Techniques ["Particles"];
-		}
-
-		protected void LoadVertexShaderFromFile (string sourceFile)
-		{
-			var path = Path.Combine (NSBundle.MainBundle.ResourcePath, "Content");
-			sourceFile = Path.Combine (path, sourceFile);
-
-			// Load the source into a string
-			string shaderSource = LoadShaderSource (sourceFile);
-
-			CreateVertexShaderFromSource (shaderSource);				
-
-		}
-
-		protected void LoadFragmentShaderFromFile (string sourceFile)
-		{
-			var path = Path.Combine (NSBundle.MainBundle.ResourcePath, "Content");
-			sourceFile = Path.Combine (path, sourceFile);
-
-			// Load the source into a string
-			string shaderSource = LoadShaderSource (sourceFile);
-
-			CreateFragmentShaderFromSource (shaderSource);				
-
-		}
-		
-		// Load the source code of a GLSL program from the content
-		private string LoadShaderSource (string name)
-		{
-
-			StreamReader streamReader = new StreamReader (name);
-			string text = streamReader.ReadToEnd ();
-			streamReader.Close ();
-
-			return text;
-
-		}
-		
-//void main(void){	
-//	gl_TexCoord[0] = gl_MultiTexCoord0;	
-//	gl_TexCoord[1] = gl_MultiTexCoord1;		
-//	gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; 
-//}
-//
-//uniform sampler2D keke;
-//uniform sampler2D smee;
-//
-//void main (void){	
-//vec2 src = vec2(gl_TexCoord[0]);	
-//vec4 dest = texture2D(keke, src);		
-//vec2 src2 = vec2(gl_TexCoord[1]);	
-//vec4 dest2 = texture2D(smee, src2);			
-//gl_FragColor = 0.5 * (dest + dest2);  
-//}
-//
-//ARBShaderObjects.glUseProgramObjectARB(shader.getProgramID());		
-//int location = shader.getUniformLocation(shader.getProgramID(), "keke");
-//int location2 = shader.getUniformLocation(shader.getProgramID(), "smee");
-//ARBMultitexture.glActiveTextureARB(ARBMultitexture.GL_TEXTURE0_ARB);
-//GL11.glBindTexture(GL11.GL_TEXTURE_2D, TestEngine.cID);
-//GL11.glEnable(GL11.GL_TEXTURE_2D);
-//ARBShaderObjects.glUniform1iARB(location, 0);
-//ARBMultitexture.glActiveTextureARB(ARBMultitexture.GL_TEXTURE1_ARB);
-//GL11.glBindTexture(GL11.GL_TEXTURE_2D, sprite.getTextureID());
-//GL11.glEnable(GL11.GL_TEXTURE_2D);	
-//ARBShaderObjects.glUniform1iARB(location2, 1);
-//EngineFunc.translate(origin.x, origin.y);
-//EngineFunc.drawQuads(sprite.getPoints());		
-//ARBShaderObjects.glUseProgramObjectARB(0);		
-//ARBMultitexture.glActiveTextureARB(ARBMultitexture.GL_TEXTURE1_ARB);
-//GL11.glDisable(GL11.GL_TEXTURE_2D);		
-//ARBMultitexture.glActiveTextureARB(ARBMultitexture.GL_TEXTURE0_ARB);
-//GL11.glDisable(GL11.GL_TEXTURE_2D);
-		
-
-	}
-}
-

Particle3DSample/ParticleSystem.cs

@@ -216,9 +216,8 @@ namespace Particle3DSample
 		/// </summary>
 		void LoadParticleEffect ()
 		{
-			//Effect effect = content.Load<Effect> ("ParticleEffect");
-			Effect effect = new ParticleEffect(GraphicsDevice);
-			
+			Effect effect = content.Load<Effect> ("ParticleEffect");
+
 			// If we have several particle systems, the content manager will return
 			// a single shared effect instance to them all. But we want to preconfigure
 			// the effect with parameters that are specific to this particular

ParticleSample/MonoGame.Samples.ParticleSample.iOS.csproj

@@ -33,7 +33,7 @@
     <WarningLevel>4</WarningLevel>
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchLink>None</MtouchLink>
-    <DefineConstants>IPHONE</DefineConstants>
+    <DefineConstants>IPHONE;</DefineConstants>
     <MtouchI18n />
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchSdkVersion>3.0</MtouchSdkVersion>
@@ -43,7 +43,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\iPhone\Debug</OutputPath>
-    <DefineConstants>DEBUG;IPHONE</DefineConstants>
+    <DefineConstants>DEBUG;IPHONE;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <MtouchDebug>true</MtouchDebug>
@@ -60,7 +60,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodesignKey>iPhone Developer</CodesignKey>
-    <DefineConstants>IPHONE</DefineConstants>
+    <DefineConstants>IPHONE;</DefineConstants>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchSdkVersion>3.0</MtouchSdkVersion>
   </PropertyGroup>
@@ -71,7 +71,7 @@
     <WarningLevel>4</WarningLevel>
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchI18n />
-    <DefineConstants>IPHONE</DefineConstants>
+    <DefineConstants>IPHONE;</DefineConstants>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchSdkVersion>3.0</MtouchSdkVersion>
   </PropertyGroup>
@@ -89,13 +89,13 @@
     <Reference Include="OpenTK" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Main.cs" />
     <Compile Include="ExplosionParticleSystem.cs" />
     <Compile Include="ExplosionSmokeParticleSystem.cs" />
     <Compile Include="Particle.cs" />
     <Compile Include="ParticleSampleGame.cs" />
     <Compile Include="ParticleSystem.cs" />
     <Compile Include="SmokePlumeParticleSystem.cs" />
+    <Compile Include="Program.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Content\" />
@@ -111,7 +111,9 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="GameThumbnail.png" />
-    <None Include="Info.iOS.plist"><Link>Info.plist</Link></None>
+    <None Include="Info.iOS.plist">
+      <Link>Info.plist</Link>
+    </None>
     <None Include="Content\explosion.png" />
     <None Include="Content\smoke.bmp" />
   </ItemGroup>

ParticleSample/Program.cs

@@ -1 +1,84 @@
-
using System;


namespace ParticleSample
{

	static class Program
	{
		/// <summary>
		/// The main entry point for the application.
		/// </summary>
		static void Main (string[] args)
		{
			MonoMac.AppKit.NSApplication.Init ();
			
			using (var p = new MonoMac.Foundation.NSAutoreleasePool ()) {
				MonoMac.AppKit.NSApplication.SharedApplication.Delegate = new AppDelegate();
				MonoMac.AppKit.NSApplication.Main(args);
			}
		}
	}
	
	class AppDelegate : MonoMac.AppKit.NSApplicationDelegate
	{
		ParticleSampleGame game;
		public override void FinishedLaunching (MonoMac.Foundation.NSObject notification)
		{

			game = new ParticleSampleGame();
			game.Run ();

		}
		
		public override bool ApplicationShouldTerminateAfterLastWindowClosed (MonoMac.AppKit.NSApplication sender)
		{
			return true;
		}
	}


}
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+#if IPHONE
+using MonoTouch.Foundation;
+using MonoTouch.UIKit;
+#endif
+
+namespace ParticleSample
+{
+	#region Entry Point
+#if IPHONE
+	[Register("AppDelegate")]
+	class Program : UIApplicationDelegate
+	{
+		ParticleSampleGame game;
+		public override void FinishedLaunching(UIApplication app)
+		{
+			// Fun begins..
+			game = new ParticleSampleGame();
+			game.Run();
+		}
+
+		/// <summary>
+		/// The main entry point for the application.
+		/// </summary>
+		static void Main(string[] args)
+		{
+			UIApplication.Main(args, null, "AppDelegate");
+		}
+	}	
+#elif MONOMAC
+	static class Program
+	{
+		/// <summary>
+		/// The main entry point for the application.
+		/// </summary>
+		static void Main (string[] args)
+		{
+			MonoMac.AppKit.NSApplication.Init ();
+			
+			using (var p = new MonoMac.Foundation.NSAutoreleasePool ()) {
+				MonoMac.AppKit.NSApplication.SharedApplication.Delegate = new AppDelegate();
+				MonoMac.AppKit.NSApplication.Main(args);
+			}
+		}
+	}
+	
+	class AppDelegate : MonoMac.AppKit.NSApplicationDelegate
+	{
+		ParticleSampleGame game;
+		public override void FinishedLaunching (MonoMac.Foundation.NSObject notification)
+		{
+	
+			game = new ParticleSampleGame();
+			game.Run ();
+	
+		}
+		
+		public override bool ApplicationShouldTerminateAfterLastWindowClosed (MonoMac.AppKit.NSApplication sender)
+		{
+			return true;
+		}
+	}
+#else
+	/// <summary>
+	/// The main entry point for the application.
+	/// </summary>
+	static class Program
+	{
+		static void Main()
+		{
+			using (ParticleSampleGame game = new ParticleSampleGame())
+			{
+				game.Run();
+			}
+		}
+	}	
+#endif
+	#endregion
+}
+

Peer2PeerSample/MonoGame.Samples.Peer2Peer.iOS.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
-    <DefineConstants>DEBUG;IOS</DefineConstants>
+    <DefineConstants>DEBUG;IPHONE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <MtouchLink>None</MtouchLink>

Peer2PeerSample/PeerToPeerGame.cs

@@ -58,7 +58,7 @@ namespace PeerToPeer
 		{
 			graphics = new GraphicsDeviceManager (this);
 			
-#if ANDROID || IOS
+#if ANDROID || IPHONE
             graphics.IsFullScreen = true;
 #else
 			graphics.PreferredBackBufferWidth = screenWidth;
@@ -81,7 +81,7 @@ namespace PeerToPeer
 
 			font = Content.Load<SpriteFont> ("Font");
 
-#if ANDROID || IOS
+#if ANDROID || IPHONE
 			gamePadTexture = Content.Load<Texture2D>("gamepad.png");
 			
 			ThumbStickDefinition thumbStickLeft = new ThumbStickDefinition();
@@ -425,7 +425,7 @@ namespace PeerToPeer
                 }
 			}
 			
-#if ANDROID || IOS
+#if ANDROID || IPHONE
 			GamePad.Draw(gameTime, spriteBatch);
 #endif
 			

Peer2PeerSample/Program.cs

@@ -15,9 +15,14 @@ using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
 using Microsoft.Xna.Framework.Net;
 
+#if MONOMAC
 using MonoMac.Foundation;
 using MonoMac.AppKit;
 using MonoMac.ObjCRuntime;
+#elif IPHONE
+using MonoTouch.Foundation;
+using MonoTouch.UIKit;
+#endif
 
 #endregion
 
@@ -26,6 +31,7 @@ namespace PeerToPeer
 {
 	
 	#region Entry Point
+#if MONOMAC
 	static class Program
 	{
 		/// <summary>
@@ -56,7 +62,37 @@ namespace PeerToPeer
 		{
 			return true;
 		}
-	}	
+	}
+#elif IPHONE
+	[Register ("AppDelegate")]
+	class Program : UIApplicationDelegate 
+	{
+		private PeerToPeerGame game;
+
+		public override void FinishedLaunching (UIApplication app)
+		{
+			// Fun begins..
+			game = new PeerToPeerGame();
+			game.Run();
+		}
+
+		static void Main (string [] args)
+		{
+			UIApplication.Main (args,null,"AppDelegate");
+		}
+	}
+#else
+	class Program
+	{
+		public static void Main(string[] args)
+		{
+			using ( PeerToPeer.PeerToPeerGame game = new  PeerToPeer.PeerToPeerGame())
+			{
+				game.Run();
+			}
+		}
+	}
+#endif
 	
 	#endregion
 }

PerPixelCollisionSample/MonoGame.Samples.PerPixelCollision.iOS.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
+    <DefineConstants>DEBUG;IPHONE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <MtouchLink>None</MtouchLink>
@@ -31,13 +31,14 @@
     <WarningLevel>4</WarningLevel>
     <MtouchLink>None</MtouchLink>
     <ConsolePause>false</ConsolePause>
+    <DefineConstants>IPHONE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\iPhone\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
+    <DefineConstants>DEBUG;IPHONE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <MtouchDebug>true</MtouchDebug>
@@ -52,6 +53,7 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <CodesignKey>iPhone Developer</CodesignKey>
+    <DefineConstants>IPHONE</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

PerPixelCollisionSample/PerPixelCollisionSample.MacOS.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
+    <DefineConstants>DEBUG;MONOMAC</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -28,6 +28,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
+    <DefineConstants>MONOMAC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

PerPixelCollisionSample/Program.cs

@@ -10,14 +10,19 @@
 #region Using Statements
 using System;
 
+#if MONOMAC
 using MonoMac.Foundation;
 using MonoMac.AppKit;
 using MonoMac.ObjCRuntime;
+#elif IPHONE
+using MonoTouch.Foundation;
+using MonoTouch.UIKit;
+#endif
 #endregion
 
 namespace PerPixelCollision
 {
-
+#if MONOMAC
 	static class Program
 	{
 		/// <summary>
@@ -48,5 +53,23 @@ namespace PerPixelCollision
 		{
 			return true;
 		}
-	}			
+	}
+#elif IPHONE
+	[Register ("AppDelegate")]
+	class Program : UIApplicationDelegate 
+	{
+        PerPixelCollisionGame game;
+		public override void FinishedLaunching (UIApplication app)
+		{
+			// Fun begins..
+			game = new PerPixelCollisionGame();
+			game.Run ();
+		}
+
+		static void Main (string [] args)
+		{
+			UIApplication.Main (args,null,"AppDelegate");
+		}
+	}
+#endif
 }

RectangleCollisionSample/MonoGame.Samples.RectangleCollision.iOS.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
+    <DefineConstants>DEBUG;IPHONE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <MtouchLink>None</MtouchLink>
@@ -31,13 +31,14 @@
     <WarningLevel>4</WarningLevel>
     <MtouchLink>None</MtouchLink>
     <ConsolePause>false</ConsolePause>
+    <DefineConstants>IPHONE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\iPhone\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
+    <DefineConstants>DEBUG;IPHONE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <MtouchDebug>true</MtouchDebug>
@@ -52,6 +53,7 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <CodesignKey>iPhone Developer</CodesignKey>
+    <DefineConstants>IPHONE</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

RectangleCollisionSample/Program.cs

@@ -10,13 +10,20 @@
 #region Using Statements
 using System;
 
+#if MONOMAC
 using MonoMac.Foundation;
 using MonoMac.AppKit;
 using MonoMac.ObjCRuntime;
+#elif IPHONE
+using MonoTouch.Foundation;
+using MonoTouch.UIKit;
+#endif
+
 #endregion
 
 namespace RectangleCollision
 {
+#if MONOMAC
 	static class Program
 	{
 		/// <summary>
@@ -47,5 +54,23 @@ namespace RectangleCollision
 		{
 			return true;
 		}
-	}		
+	}	
+#elif IPHONE
+	[Register ("AppDelegate")]
+	class Program : UIApplicationDelegate 
+	{
+        RectangleCollisionGame game;
+		public override void FinishedLaunching (UIApplication app)
+		{
+			// Fun begins..
+			game = new RectangleCollisionGame();
+			game.Run();
+		}
+
+		static void Main (string [] args)
+		{
+			UIApplication.Main (args,null,"AppDelegate");
+		}
+	}
+#endif
 }

RectangleCollisionSample/RectangleCollisionSample.MacOS.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
+    <DefineConstants>DEBUG;MONOMAC</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -28,6 +28,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
+    <DefineConstants>MONOMAC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

RenderTarget2DSample/Game1.cs

@@ -55,7 +55,7 @@ namespace RenderTarget2DSample
 			// Create the GraphicsDeviceManager for our game.
 			graphics = new GraphicsDeviceManager (this);
 
-#if ANDROID || IOS
+#if ANDROID || IPHONE
             graphics.IsFullScreen = true;
 #else
 			graphics.PreferredBackBufferWidth = 800;

RenderTarget2DSample/MonoGame.Samples.RenderTarget2D.iOS.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
+    <DefineConstants>DEBUG;IPHONE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <MtouchLink>None</MtouchLink>
@@ -32,13 +32,14 @@
     <WarningLevel>4</WarningLevel>
     <MtouchLink>None</MtouchLink>
     <ConsolePause>false</ConsolePause>
+    <DefineConstants>IPHONE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\iPhone\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
+    <DefineConstants>DEBUG;IPHONE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <MtouchDebug>true</MtouchDebug>
@@ -54,6 +55,7 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <CodesignKey>iPhone Developer</CodesignKey>
+    <DefineConstants>IPHONE</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -62,7 +64,9 @@
     <Reference Include="monotouch" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.iOS.plist"><Link>Info.plist</Link></None>
+    <None Include="Info.iOS.plist">
+      <Link>Info.plist</Link>
+    </None>
     <None Include="Background.png">
       <Link>Background.png</Link>
     </None>
@@ -71,10 +75,10 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Main.cs" />
     <Compile Include="Game1.cs">
       <Link>Game1.cs</Link>
     </Compile>
+    <Compile Include="Program.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>

RenderTarget2DSample/Program.cs

@@ -1,9 +1,15 @@
-
+#if MONOMAC
 using MonoMac.AppKit;
 using MonoMac.Foundation;
+#elif IPHONE
+using MonoTouch.Foundation;
+using MonoTouch.UIKit;
+#endif
 
 namespace RenderTarget2DSample
 {
+	#region Entry Point
+#if MONOMAC
 	static class Program
 	{
 		/// <summary>
@@ -36,6 +42,28 @@ namespace RenderTarget2DSample
 		{
 			return true;
 		}
-	}		
+	}	
+#elif IPHONE
+    [Register("AppDelegate")]
+    class Program : UIApplicationDelegate
+    {
+        Game1 game;
+        public override void FinishedLaunching(UIApplication app)
+        {
+            // Fun begins..
+            game = new Game1();
+            game.Run();
+        }
+
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        static void Main(string[] args)
+        {
+            UIApplication.Main(args, null, "AppDelegate");
+        }
+    }
+#endif
+    #endregion
 }
 

RenderTarget2DSample/RenderTarget2DSample.MacOS.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
+    <DefineConstants>DEBUG;MONOMAC</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -28,6 +28,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
+    <DefineConstants>MONOMAC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

StateObjectWindows/StateObjectWindows.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG; MAC</DefineConstants>
+    <DefineConstants>DEBUG; MONOMAC</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>

StencilsCratersTutorial/Program.cs

@@ -17,7 +17,7 @@ namespace StencilCratersTutorial
         }
     }
 #endif
-#if MAC
+#if MONOMAC
 	static class Program
 	{
 		/// <summary>

TexturedQuad/TexturedQuad.MacOS.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;MAC</DefineConstants>
+    <DefineConstants>DEBUG;MONOMAC</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -28,6 +28,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
+    <DefineConstants>MONOMAC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

TransformedCollisionSample/MonoGame.Samples.TransformedCollision.iOS.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
+    <DefineConstants>DEBUG;IPHONE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <MtouchLink>None</MtouchLink>
@@ -31,13 +31,14 @@
     <WarningLevel>4</WarningLevel>
     <MtouchLink>None</MtouchLink>
     <ConsolePause>false</ConsolePause>
+    <DefineConstants>IPHONE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\iPhone\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
+    <DefineConstants>DEBUG;IPHONE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <MtouchDebug>true</MtouchDebug>
@@ -52,6 +53,7 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <CodesignKey>iPhone Developer</CodesignKey>
+    <DefineConstants>IPHONE</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

TransformedCollisionSample/Program.cs

@@ -10,13 +10,19 @@
 #region Using Statements
 using System;
 
+#if MONOMAC
 using MonoMac.Foundation;
 using MonoMac.AppKit;
 using MonoMac.ObjCRuntime;
+#elif IPHONE
+using MonoTouch.Foundation;
+using MonoTouch.UIKit;
+#endif
 #endregion
 
 namespace TransformedCollision
 {
+#if MONOMAC
 	static class Program
 	{
 		/// <summary>
@@ -47,4 +53,22 @@ namespace TransformedCollision
 			return true;
 		}
 	}	
+#elif IPHONE
+	[Register ("AppDelegate")]
+	class Program : UIApplicationDelegate 
+	{
+        TransformedCollisionGame game;
+		public override void FinishedLaunching (UIApplication app)
+		{
+			// Fun begins..
+			game = new TransformedCollisionGame();
+			game.Run ();
+		}
+
+		static void Main (string [] args)
+		{
+			UIApplication.Main (args,null,"AppDelegate");
+		}
+	}
+#endif
 }

TransformedCollisionSample/TransformedCollisionSample.MacOS.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
+    <DefineConstants>DEBUG;MONOMAC</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -28,6 +28,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
+    <DefineConstants>MONOMAC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

UseCustomVertex/Program.cs

@@ -26,7 +26,7 @@ namespace UseCustomVertexWindows
         }
     }
 #endif
-#if MAC
+#if MONOMAC
 
 	static class Program
 	{	

UseCustomVertex/UseCustomVertex.MacOS.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG; MAC</DefineConstants>
+    <DefineConstants>DEBUG; MONOMAC</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -40,7 +40,8 @@
     <Reference Include="MonoMac" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist"></None>
+    <None Include="Info.plist">
+    </None>
     <None Include="App.config" />
     <None Include="Game.ico" />
     <None Include="GameThumbnail.png" />
@@ -66,7 +67,6 @@
     <Folder Include="Content\" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Content\XNA_pow2.jpg" />
     <Content Include="Content\Glass2.png" />
   </ItemGroup>
 </Project>

VideoPlayer/MonoGame.Samples.VideoPlayer.iOS.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
-    <DefineConstants>DEBUG;IOS</DefineConstants>
+    <DefineConstants>DEBUG;IPHONE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>

VideoPlayer/main.cs

@@ -1,8 +1,14 @@
+#if MONOMAC
 using MonoMac.AppKit;
 using MonoMac.Foundation;
+#elif IPHONE
+using MonoTouch.Foundation;
+using MonoTouch.UIKit;
+#endif
 
 namespace MonoGame.Samples.VideoPlayer
 {
+#if MONOMAC
 	class Program
 	{
 		static void Main (string[] args)
@@ -36,4 +42,25 @@ namespace MonoGame.Samples.VideoPlayer
 			return true;
 		}
 	}	
+#elif IPHONE
+	[Register("AppDelegate")]
+	class Program : UIApplicationDelegate
+	{
+		private Game1 game;
+
+		public override void FinishedLaunching (UIApplication app)
+		{
+			game = new Game1 ();
+			game.Run ();
+		}
+
+		/// <summary>
+		/// The main entry point for the application.
+		/// </summary>
+		static void Main (string[] args)
+		{
+			UIApplication.Main (args, null, "AppDelegate");
+		}
+	}
+#endif
 }