Przeglądaj źródła

Updated some of the Mac projects to actually work.

Dean Ellis 12 lat temu
rodzic
commit
e54103b1b7
39 zmienionych plików z 368 dodań i 85 usunięć
  1. 10 0
      Audio3D/Audio3D.MacOS.csproj
  2. 10 0
      BackgroundThreadTester/BackgroundThreadTester.MacOS.csproj
  3. 42 8
      BloomSample/BloomSample.MacOS.csproj
  4. BIN
      BloomSample/Content/BloomCombine.xnb
  5. BIN
      BloomSample/Content/BloomExtract.xnb
  6. BIN
      BloomSample/Content/GaussianBlur.xnb
  7. BIN
      BloomSample/Content/sunset.xnb
  8. 10 0
      BookSourceCode/XNAGameDevelopmentbyExampleCode/AsteroidBeltAssault/AsteroidBeltAssault.MacOS.csproj
  9. 10 0
      BookSourceCode/XNAGameDevelopmentbyExampleCode/FloodControl/FloodControl.MacOS.csproj
  10. 8 0
      BookSourceCode/XNAGameDevelopmentbyExampleCode/GemstoneHunter/GemstoneHunter.MacOS.csproj
  11. 10 0
      BookSourceCode/XNAGameDevelopmentbyExampleCode/GemstoneHunter/TileEngine/Tile Engine.MacOS.csproj
  12. 10 0
      BookSourceCode/XNAGameDevelopmentbyExampleCode/RobotRampage/RobotRampage.MacOS.csproj
  13. 17 6
      BouncingBox/BouncingBox.MacOS.csproj
  14. 2 1
      BouncingBox/Game1.cs
  15. 10 0
      CatapaultWars/CatapaultGame.MacOS.csproj
  16. 10 0
      CatapultNetWars/CatapultNetWars.MacOS.csproj
  17. 10 0
      ChaseAndEvade/ChaseAndEvade.MacOS.csproj
  18. 10 0
      Colored3DCube/Colored3DCube.MacOS.csproj
  19. 18 6
      Draw2D/Draw2D.MacOS.csproj
  20. 10 0
      FarseerPhysicsEngine/FarseerPhysicsEngine.csproj
  21. 8 0
      FarseerSamples/FarseerSamples.MacOS.csproj
  22. 10 0
      GameStateManagement/GameStateManagement.MacOS.csproj
  23. 10 0
      GooCursor/GooCursor.MacOS.csproj
  24. 10 0
      Graphics3DSample/Graphics3DSample.MacOS.csproj
  25. 10 0
      HoneycombRush/HoneycombRush.MacOS.csproj
  26. 10 0
      InputReporter/InputReporter.MacOS.csproj
  27. 10 0
      LensFlare/LensFlare.MacOS.csproj
  28. 0 46
      NetRumble/Content/Effects/Clouds.fx
  29. 30 12
      NetRumble/NetRumble.MacOS.csproj
  30. 1 1
      NetRumble/Screens/GameplayScreen.cs
  31. 10 0
      NetworkPrediction/NetworkPrediction.MacOS.csproj
  32. 1 1
      NetworkPrediction/NetworkPredictionGame.cs
  33. 10 0
      NetworkStateManagement/NetworkStateManagement.MacOS.csproj
  34. 2 3
      NetworkStateManagement/Program.cs
  35. 8 0
      Particle3DSample/Particle3DSample.MacOS.csproj
  36. 10 0
      Particle3DSample/ParticleSettings/ParticleSettings.csproj
  37. 10 0
      ParticleSample/ParticleSample.MacOS.csproj
  38. 11 1
      RolePlayingGame/RolePlayingGame.MacOS.csproj
  39. 10 0
      RolePlayingGame/RolePlayingGameData/RolePlayingGameData.csproj

+ 10 - 0
Audio3D/Audio3D.MacOS.csproj

@@ -94,4 +94,14 @@
     <Content Include="Content\DogTexture.xnb" />
     <Content Include="Content\checker.xnb" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

+ 10 - 0
BackgroundThreadTester/BackgroundThreadTester.MacOS.csproj

@@ -78,4 +78,14 @@
   <ItemGroup>
     <InterfaceDefinition Include="MainMenu.xib" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

+ 42 - 8
BloomSample/BloomSample.MacOS.csproj

@@ -82,13 +82,47 @@
     <Folder Include="Content\" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Content\BloomCombine.xnb" />
-    <Content Include="Content\BloomExtract.xnb" />
-    <Content Include="Content\GaussianBlur.xnb" />
-    <Content Include="Content\engine_diff_tex_0.xnb" />
-    <Content Include="Content\hudFont.xnb" />
-    <Content Include="Content\sunset.xnb" />
-    <Content Include="Content\tank.xnb" />
-    <Content Include="Content\turret_alt_diff_tex_0.xnb" />
+    <Content Include="..\CompiledContent\OSX\Content\Effects\BloomCombine.xnb">
+      <Link>Content\BloomCombine.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\CompiledContent\OSX\Content\Effects\BloomExtract.xnb">
+      <Link>Content\BloomExtract.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\CompiledContent\OSX\Content\Effects\GaussianBlur.xnb">
+      <Link>Content\GaussianBlur.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\CompiledContent\OSX\Content\Models\engine_diff_tex_0.xnb">
+      <Link>Content\engine_diff_tex_0.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\CompiledContent\OSX\Content\Models\tank.xnb">
+      <Link>Content\tank.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\CompiledContent\OSX\Content\Models\turret_alt_diff_tex_0.xnb">
+      <Link>Content\turret_alt_diff_tex_0.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\CompiledContent\OSX\Content\Textures\sunset.xnb">
+      <Link>Content\sunset.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\CompiledContent\OSX\Content\Fonts\HUDFont.xnb">
+      <Link>Content\HUDFont.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>

BIN
BloomSample/Content/BloomCombine.xnb


BIN
BloomSample/Content/BloomExtract.xnb


BIN
BloomSample/Content/GaussianBlur.xnb


BIN
BloomSample/Content/sunset.xnb


+ 10 - 0
BookSourceCode/XNAGameDevelopmentbyExampleCode/AsteroidBeltAssault/AsteroidBeltAssault.MacOS.csproj

@@ -86,4 +86,14 @@
     <Compile Include="Sprite.cs" />
     <Compile Include="StarField.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

+ 10 - 0
BookSourceCode/XNAGameDevelopmentbyExampleCode/FloodControl/FloodControl.MacOS.csproj

@@ -76,4 +76,14 @@
     <Content Include="Content\Textures\Tile_Sheet.xnb" />
     <Content Include="Content\Textures\TitleScreen.xnb" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

+ 8 - 0
BookSourceCode/XNAGameDevelopmentbyExampleCode/GemstoneHunter/GemstoneHunter.MacOS.csproj

@@ -62,6 +62,14 @@
       <Project>{521972FD-1A9B-4CFD-A435-EB2224985131}</Project>
       <Name>Tile Engine.MacOS</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Content\" />

+ 10 - 0
BookSourceCode/XNAGameDevelopmentbyExampleCode/GemstoneHunter/TileEngine/Tile Engine.MacOS.csproj

@@ -42,4 +42,14 @@
   <ItemGroup>
     <None Include="AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

+ 10 - 0
BookSourceCode/XNAGameDevelopmentbyExampleCode/RobotRampage/RobotRampage.MacOS.csproj

@@ -83,4 +83,14 @@
     <Compile Include="TileMap.cs" />
     <Compile Include="WeaponManager.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

+ 17 - 6
BouncingBox/BouncingBox.MacOS.csproj

@@ -62,16 +62,27 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Content\font.xnb">
-      <Link>Content\font.xnb</Link>
-    </Content>
-    <Content Include="Content\monogameicon.png">
-      <Link>Content\monogameicon.png</Link>
-    </Content>
     <Content Include="monogameicon.png" />
+    <Content Include="..\CompiledContent\OSX\Content\Textures\logo.xnb">
+      <Link>Content\logo.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <None Include="Info.plist">
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Content\" />
+  </ItemGroup>
 </Project>

+ 2 - 1
BouncingBox/Game1.cs

@@ -66,7 +66,7 @@ namespace Microsoft.Xna.Samples.BouncingBox
 			spriteBatch = new SpriteBatch (GraphicsDevice);
 
 			// TODO: use this.Content to load your game content here
-			texture = Content.Load<Texture2D> ("monogameicon");
+			texture = Content.Load<Texture2D> ("logo");
 		}
 		/// <summary>
 		/// Allows the game to run logic such as updating the world,
@@ -76,6 +76,7 @@ namespace Microsoft.Xna.Samples.BouncingBox
 		protected override void Update (GameTime gameTime)
 		{
 			// TODO: Add your update logic here
+			if (Keyboard.GetState().IsKeyDown(Keys.Escape)) Exit();
 
 			if (texture != null) {
 				//  Keep inside the screen

+ 10 - 0
CatapaultWars/CatapaultGame.MacOS.csproj

@@ -116,4 +116,14 @@
     <Content Include="Content\Textures\HUD\hudBackground.xnb" />
     <Content Include="Content\Textures\HUD\windArrow.xnb" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

+ 10 - 0
CatapultNetWars/CatapultNetWars.MacOS.csproj

@@ -142,4 +142,14 @@
   <ItemGroup>
     <EmbeddedResource Include="Resources.resx" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

+ 10 - 0
ChaseAndEvade/ChaseAndEvade.MacOS.csproj

@@ -77,4 +77,14 @@
     </Content>
     <Content Include="GameThumbnail.png" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

+ 10 - 0
Colored3DCube/Colored3DCube.MacOS.csproj

@@ -62,4 +62,14 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

+ 18 - 6
Draw2D/Draw2D.MacOS.csproj

@@ -64,18 +64,30 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Content\monogameicon.png">
-    </Content>
-    <Content Include="Content\purpleBall.xnb">
-    </Content>
-    <Content Include="Content\spriteFont1.xnb">
-    </Content>
     <Content Include="Default.png">
     </Content>
     <Content Include="monogameicon.png" />
+    <Content Include="..\CompiledContent\OSX\Content\Fonts\Font.xnb">
+      <Link>Content\Font.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\CompiledContent\OSX\Content\Textures\logo.xnb">
+      <Link>Content\logo.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <None Include="Info.plist">
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

+ 10 - 0
FarseerPhysicsEngine/FarseerPhysicsEngine.csproj

@@ -147,4 +147,14 @@
     <Compile Include="DebugView.cs" />
     <Compile Include="Settings.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

+ 8 - 0
FarseerSamples/FarseerSamples.MacOS.csproj

@@ -72,6 +72,14 @@
       <Project>{D6E4E5BC-8998-4718-8E84-80901E6739CC}</Project>
       <Name>FarseerPhysicsEngine</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Main.cs" />

+ 10 - 0
GameStateManagement/GameStateManagement.MacOS.csproj

@@ -90,4 +90,14 @@
     <Content Include="Content\gradient.xnb" />
     <Content Include="Content\menufont.xnb" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

+ 10 - 0
GooCursor/GooCursor.MacOS.csproj

@@ -71,4 +71,14 @@
     <Content Include="Content\SimpleFont.xnb" />
     <Content Include="Content\cursor.xnb" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

+ 10 - 0
Graphics3DSample/Graphics3DSample.MacOS.csproj

@@ -97,4 +97,14 @@
     <Content Include="Content\Textures\spaceBG.xnb" />
     <Content Include="Content\AnimationDef.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

+ 10 - 0
HoneycombRush/HoneycombRush.MacOS.csproj

@@ -157,4 +157,14 @@
     <Content Include="Content\Textures\Backgrounds\titleScreen.xnb" />
     <Content Include="Content\Sounds\FillingHoneyPot_Loop.xnb" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

+ 10 - 0
InputReporter/InputReporter.MacOS.csproj

@@ -100,4 +100,14 @@
   <ItemGroup>
     <EmbeddedResource Include="InputReporterResources.resx" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

+ 10 - 0
LensFlare/LensFlare.MacOS.csproj

@@ -88,4 +88,14 @@
     <Content Include="Content\ground_0.xnb" />
     <Content Include="Content\terrain.xnb" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

+ 0 - 46
NetRumble/Content/Effects/Clouds.fx

@@ -1,46 +0,0 @@
-//-----------------------------------------------------------------------------
-// Clouds.fx
-//
-// Microsoft XNA Community Game Platform
-// Copyright (C) Microsoft Corporation. All rights reserved.
-//-----------------------------------------------------------------------------
-
-
-// the relative position for the texture coordinates, inducing a slight parallax
-float2 Position;
-
-
-// modify the sampler state on the zero texture sampler, used by SpriteBatch
-sampler TextureSampler : register(s0) = 
-sampler_state
-{
-    AddressU = Wrap;
-    AddressV = Wrap;
-};
-
-
-float4 PixelShaderFunction(float2 texCoord : TEXCOORD0) : COLOR0
-{
-    // sample from the cloud texture for the blue component
-    texCoord.x += Position.x * 0.00025f;
-    texCoord.y += Position.y * 0.00025f;
-    texCoord *= 0.5f;
-    float4 results = float4(0,0,1,0.25) * tex2D(TextureSampler, texCoord);
-
-    // sample from the cloud texture for the green component
-    texCoord.x += Position.x * 0.00025f + 0.25f;
-    texCoord.y += Position.y * 0.00025f - 0.15;
-    texCoord *= 0.4f;
-    results += float4(0,1,0,0.15) * tex2D(TextureSampler, texCoord);
-        
-    return results;
-}
-
-
-technique Technique1
-{
-    pass Pass1
-    {
-        PixelShader = compile ps_2_0 PixelShaderFunction();
-    }
-}

+ 30 - 12
NetRumble/NetRumble.MacOS.csproj

@@ -68,10 +68,6 @@
     <None Include="Content\Audio\wav\powerup_spawn.wav" />
     <None Include="Content\Audio\wav\powerup_touch.wav" />
     <None Include="Content\Audio\wav\rocket.wav" />
-    <None Include="Content\BloomPostprocess\Effects\BloomCombine.fx" />
-    <None Include="Content\BloomPostprocess\Effects\BloomExtract.fx" />
-    <None Include="Content\BloomPostprocess\Effects\GaussianBlur.fx" />
-    <None Include="Content\Effects\Clouds.fx" />
     <None Include="Content\Fonts\MenuFont.spritefont" />
     <None Include="Content\Fonts\MessageBox.spritefont" />
     <None Include="Content\Fonts\NetRumbleFont.png" />
@@ -207,10 +203,6 @@
     <Content Include="Content\Particles\rocketTrail.xml" />
     <Content Include="Content\Particles\shipExplosion.xml" />
     <Content Include="Content\Particles\shipSpawn.xml" />
-    <Content Include="Content\Effects\Clouds.xnb" />
-    <Content Include="Content\BloomPostprocess\Effects\BloomCombine.xnb" />
-    <Content Include="Content\BloomPostprocess\Effects\BloomExtract.xnb" />
-    <Content Include="Content\BloomPostprocess\Effects\GaussianBlur.xnb" />
     <Content Include="Content\Audio\wav\asteroid_touch.xnb" />
     <Content Include="Content\Audio\wav\explosion_large.xnb" />
     <Content Include="Content\Audio\wav\explosion_medium.xnb" />
@@ -226,10 +218,36 @@
     <Content Include="Content\Audio\wav\powerup_spawn.xnb" />
     <Content Include="Content\Audio\wav\powerup_touch.xnb" />
     <Content Include="Content\Audio\wav\rocket.xnb" />
-    <Content Include="Content\Effects\Clouds.fsh" />
-    <Content Include="Content\BloomPostprocess\Effects\BloomCombine.fsh" />
-    <Content Include="Content\BloomPostprocess\Effects\BloomExtract.fsh" />
-    <Content Include="Content\BloomPostprocess\Effects\GaussianBlur.fsh" />
     <Content Include="Content\One Step Beyond.wma" />
+    <Content Include="..\CompiledContent\OSX\Content\Effects\BloomCombine.xnb">
+      <Link>Content\BloomPostprocess\Effects\BloomCombine.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\CompiledContent\OSX\Content\Effects\BloomExtract.xnb">
+      <Link>Content\BloomPostprocess\Effects\BloomExtract.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\CompiledContent\OSX\Content\Effects\GaussianBlur.xnb">
+      <Link>Content\BloomPostprocess\Effects\GaussianBlur.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\CompiledContent\OSX\Content\Effects\Clouds.xnb">
+      <Link>Content\Effects\Clouds.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Content\Effects\" />
+    <Folder Include="Content\BloomPostprocess\Effects\" />
   </ItemGroup>
 </Project>

+ 1 - 1
NetRumble/Screens/GameplayScreen.cs

@@ -164,7 +164,7 @@ namespace NetRumble
 		// Comment or uncomment from here
 		// ***************************	
             // create and add the bloom effect
-#if BLOOM
+#if !BLOOM
             bloomComponent = new BloomComponent(ScreenManager.Game);
             bloomComponent.Settings = BloomSettings.PresetSettings[0];
             ScreenManager.Game.Components.Add(bloomComponent);

+ 10 - 0
NetworkPrediction/NetworkPrediction.MacOS.csproj

@@ -69,4 +69,14 @@
     <Content Include="Content\Tank.xnb" />
     <Content Include="Content\Turret.xnb" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

+ 1 - 1
NetworkPrediction/NetworkPredictionGame.cs

@@ -146,7 +146,7 @@ namespace NetworkPrediction
         {
             if (IsActive)
             {
-                if (Gamer.SignedInGamers.Count == 0)
+				if (Gamer.SignedInGamers.Count == 0 && !Guide.IsVisible)
                 {
                     // If there are no profiles signed in, we cannot proceed.
                     // Show the Guide so the user can sign in.

+ 10 - 0
NetworkStateManagement/NetworkStateManagement.MacOS.csproj

@@ -111,4 +111,14 @@
   <ItemGroup>
     <EmbeddedResource Include="Resources.resx" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

+ 2 - 3
NetworkStateManagement/Program.cs

@@ -34,9 +34,8 @@ namespace NetworkStateManagement
 		
 		public override void FinishedLaunching (MonoMac.Foundation.NSObject notification)
 		{
-			using (NetworkStateManagementGame game = new NetworkStateManagementGame ()) {
-				game.Run ();
-			}
+			NetworkStateManagementGame game = new NetworkStateManagementGame ();
+			game.Run ();
 		}
 		
 		public override bool ApplicationShouldTerminateAfterLastWindowClosed (NSApplication sender)

+ 8 - 0
Particle3DSample/Particle3DSample.MacOS.csproj

@@ -60,6 +60,14 @@
       <Project>{3388FF68-6F15-4F36-B226-7823E5309E92}</Project>
       <Name>ParticleSettings</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />

+ 10 - 0
Particle3DSample/ParticleSettings/ParticleSettings.csproj

@@ -52,4 +52,14 @@
   <ItemGroup>
     <Compile Include="ParticleSettings.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

+ 10 - 0
ParticleSample/ParticleSample.MacOS.csproj

@@ -75,4 +75,14 @@
     <Content Include="Content\font.xnb" />
     <Content Include="Content\smoke.xnb" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

+ 11 - 1
RolePlayingGame/RolePlayingGame.MacOS.csproj

@@ -2152,7 +2152,9 @@
     <Content Include="Content\Textures\Spells\Potion3h.xnb" />
     <Content Include="Content\Textures\Spells\Scroll.xnb" />
     <Content Include="Content\Textures\Spells\SmallIcon.xnb" />
-    <Content Include="Content\Audio\RPGAudio.xgs" />
+    <Content Include="Content\Audio\RPGAudio.xgs">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Audio\RpgAudio.xap" />
     <Content Include="Content\Audio\Sound Bank.xsb" />
     <Content Include="Content\Audio\Wave Bank.xwb" />
@@ -2163,5 +2165,13 @@
       <Project>{098BBC2D-63A6-4C22-8A30-E6C4F4FC0AC4}</Project>
       <Name>RolePlayingGameData</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>

+ 10 - 0
RolePlayingGame/RolePlayingGameData/RolePlayingGameData.csproj

@@ -82,4 +82,14 @@
   <ItemGroup>
     <None Include="AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>