Re-include the mac project in the main solution

diff --git a/SuperPolarity.sln b/SuperPolarity.sln
index 6ee66e418b1cfba5c71caf1cde6397329a182ef1..9115f5a26069aa832c5218125c360ab6ba0a4d2f 100644 (file)
--- a/SuperPolarity.sln
+++ b/SuperPolarity.sln
@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SuperPolarityLinux", "Super
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SuperPolarityContentContent", "SuperPolarityContent\SuperPolarityContentContent\SuperPolarityContentContent.contentproj", "{468F8415-7D38-4718-B0B4-E18F1A427136}"
 EndProject
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SuperPolarityContentContent", "SuperPolarityContent\SuperPolarityContentContent\SuperPolarityContentContent.contentproj", "{468F8415-7D38-4718-B0B4-E18F1A427136}"
 EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SuperPolarityMac", "SuperPolarityMac\SuperPolarityMac.csproj", "{EE77A85A-089B-4055-90D0-6E08DF409410}"
+EndProject

 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Android|Any CPU = Android|Any CPU
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Android|Any CPU = Android|Any CPU


@@ -40,10 +42,11 @@ Global
                Windows8|Any CPU = Windows8|Any CPU
                Windows8|Mixed Platforms = Windows8|Mixed Platforms
                Windows8|x86 = Windows8|x86
                Windows8|Any CPU = Windows8|Any CPU
                Windows8|Mixed Platforms = Windows8|Mixed Platforms
                Windows8|x86 = Windows8|x86

+               Debug|Any CPU = Debug|Any CPU
+               Release|Any CPU = Release|Any CPU
+               AppStore|Any CPU = AppStore|Any CPU

        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution

-               {2585188B-339D-44CD-9599-1A80AA30DE13}.Android|Any CPU.ActiveCfg = Release|x86
-               {2585188B-339D-44CD-9599-1A80AA30DE13}.Android|Mixed Platforms.ActiveCfg = Release|x86

                {2585188B-339D-44CD-9599-1A80AA30DE13}.Android|Mixed Platforms.Build.0 = Release|x86
                {2585188B-339D-44CD-9599-1A80AA30DE13}.Android|x86.ActiveCfg = Release|x86
                {2585188B-339D-44CD-9599-1A80AA30DE13}.Android|x86.Build.0 = Release|x86
                {2585188B-339D-44CD-9599-1A80AA30DE13}.Android|Mixed Platforms.Build.0 = Release|x86
                {2585188B-339D-44CD-9599-1A80AA30DE13}.Android|x86.ActiveCfg = Release|x86
                {2585188B-339D-44CD-9599-1A80AA30DE13}.Android|x86.Build.0 = Release|x86


@@ -213,11 +216,17 @@ Global
                {468F8415-7D38-4718-B0B4-E18F1A427136}.Windows8|Any CPU.ActiveCfg = Windows8|Any CPU
                {468F8415-7D38-4718-B0B4-E18F1A427136}.Windows8|Mixed Platforms.ActiveCfg = Windows8|Any CPU
                {468F8415-7D38-4718-B0B4-E18F1A427136}.Windows8|x86.ActiveCfg = Windows8|Any CPU
                {468F8415-7D38-4718-B0B4-E18F1A427136}.Windows8|Any CPU.ActiveCfg = Windows8|Any CPU
                {468F8415-7D38-4718-B0B4-E18F1A427136}.Windows8|Mixed Platforms.ActiveCfg = Windows8|Any CPU
                {468F8415-7D38-4718-B0B4-E18F1A427136}.Windows8|x86.ActiveCfg = Windows8|Any CPU

+               {EE77A85A-089B-4055-90D0-6E08DF409410}.AppStore|Any CPU.ActiveCfg = AppStore|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.AppStore|Any CPU.Build.0 = AppStore|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.Release|Any CPU.Build.0 = Release|Any CPU

        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
        EndGlobalSection
        GlobalSection(MonoDevelopProperties) = preSolution
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
        EndGlobalSection
        GlobalSection(MonoDevelopProperties) = preSolution

-               StartupItem = SuperPolarity\SuperPolarity.csproj
+               StartupItem = SuperPolarity\SuperPolarityMac\SuperPolarityMac.csproj

        EndGlobalSection
 EndGlobal
        EndGlobalSection
 EndGlobal

diff --git a/SuperPolarity.userprefs b/SuperPolarity.userprefs
index 695350a074aea097c073ff0e2d14c44df6fe0e34..4fdd7465c2ff4edd6ea21614b2e206934625596a 100644 (file)
--- a/SuperPolarity.userprefs
+++ b/SuperPolarity.userprefs
@@ -1,10 +1,10 @@
-<Properties MonoDevelop.MonoMac.LastXamMacNagTime="2/7/2014 5:17:50 AM">
+<Properties MonoDevelop.MonoMac.LastXamMacNagTime="5/31/2014 6:17:13 PM">

   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />

-  <MonoDevelop.Ide.Workbench ActiveDocument="SuperPolarity/SuperPolarity.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="SuperPolarity/Program.cs">

     <Files>
       <File FileName="SuperPolarity/Program.cs" Line="1" Column="1" />
       <File FileName="SuperPolarityMac/Program.cs" Line="1" Column="1" />
     <Files>
       <File FileName="SuperPolarity/Program.cs" Line="1" Column="1" />
       <File FileName="SuperPolarityMac/Program.cs" Line="1" Column="1" />

-      <File FileName="SuperPolarity/SuperPolarity.cs" Line="61" Column="13" />
+      <File FileName="SuperPolarity/SuperPolarity.cs" Line="1" Column="1" />

       <File FileName="SuperPolarityLinux/Program.cs" Line="1" Column="1" />
     </Files>
   </MonoDevelop.Ide.Workbench>
       <File FileName="SuperPolarityLinux/Program.cs" Line="1" Column="1" />
     </Files>
   </MonoDevelop.Ide.Workbench>

diff --git a/SuperPolarity/Actors/Generators/Generator.cs b/SuperPolarity/Actors/Generators/Generator.cs
index 4e2cc3eba3985c2feac07dbc95c2cdf13f7dbfb0..8267dc06c092468cee3bfc4eab719c42460fc019 100644 (file)
--- a/SuperPolarity/Actors/Generators/Generator.cs
+++ b/SuperPolarity/Actors/Generators/Generator.cs
@@ -1,4 +1,5 @@
 using System;
 using System;

+using Microsoft.Xna.Framework;

 
 namespace SuperPolarity
 {
 
 namespace SuperPolarity
 {

diff --git a/SuperPolarityMac/SuperPolarityMac.userprefs b/SuperPolarityMac/SuperPolarityMac.userprefs
index 9c0cef435d3ea188125dbb90d113744505b50b87..e2d5d0c447daec0b265dbca92e2766b7596dcb62 100644 (file)
--- a/SuperPolarityMac/SuperPolarityMac.userprefs
+++ b/SuperPolarityMac/SuperPolarityMac.userprefs
@@ -1,16 +1,15 @@
-<Properties MonoDevelop.MonoMac.LastXamMacNagTime="5/31/2014 4:22:16 PM">
+<Properties MonoDevelop.MonoMac.LastXamMacNagTime="5/31/2014 6:13:47 PM">

   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />

-  <MonoDevelop.Ide.Workbench ActiveDocument="Actors/Generators/RingGenerator.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="../SuperPolarity/SuperPolarity.cs">

     <Files>
     <Files>

-      <File FileName="../SuperPolarity/Actors/Bullet.cs" Line="15" Column="1" />
-      <File FileName="Actors/Generators/Generator.cs" Line="10" Column="21" />
-      <File FileName="Actors/Generators/FanGenerator.cs" Line="7" Column="13" />
-      <File FileName="Actors/Generators/LineGenerator.cs" Line="7" Column="14" />
-      <File FileName="Actors/Generators/PointGenerator.cs" Line="7" Column="15" />
-      <File FileName="Actors/Generators/RingGenerator.cs" Line="11" Column="3" />
-      <File FileName="Actors/Generators/WaveGenerator.cs" Line="7" Column="14" />
-      <File FileName="../SuperPolarity/Actors/Actor.cs" Line="68" Column="19" />
-      <File FileName="../SuperPolarity/ActorManager.cs" Line="163" Column="1" />
+      <File FileName="../SuperPolarity/Actors/Actor.cs" Line="1" Column="1" />
+      <File FileName="../SuperPolarity/Actors/GameActor.cs" Line="1" Column="1" />
+      <File FileName="../SuperPolarity/Actors/Bullet.cs" Line="1" Column="1" />
+      <File FileName="../SuperPolarity/Actors/Ship.cs" Line="1" Column="1" />
+      <File FileName="../SuperPolarity/ActorManager.cs" Line="1" Column="1" />
+      <File FileName="../SuperPolarity/Actors/MainShip.cs" Line="1" Column="1" />
+      <File FileName="../SuperPolarity/Actors/Generators/Generator.cs" Line="1" Column="1" />
+      <File FileName="../SuperPolarity/SuperPolarity.cs" Line="1" Column="1" />

     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>