Consolidates windows project

diff --git a/SuperPolarity.sln b/SuperPolarity.sln
index 9115f5a26069aa832c5218125c360ab6ba0a4d2f..ed83bac6094d9b33361c5f3fc9fc71c1c4ffc4db 100644 (file)
--- a/SuperPolarity.sln
+++ b/SuperPolarity.sln
@@ -18,6 +18,9 @@ Global
                Android|Any CPU = Android|Any CPU
                Android|Mixed Platforms = Android|Mixed Platforms
                Android|x86 = Android|x86
+               AppStore|Any CPU = AppStore|Any CPU
+               AppStore|Mixed Platforms = AppStore|Mixed Platforms
+               AppStore|x86 = AppStore|x86
                Debug|Any CPU = Debug|Any CPU
                Debug|Mixed Platforms = Debug|Mixed Platforms
                Debug|x86 = Debug|x86
@@ -42,14 +45,15 @@ Global
                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
-               {2585188B-339D-44CD-9599-1A80AA30DE13}.Android|Mixed Platforms.Build.0 = Release|x86
+               {2585188B-339D-44CD-9599-1A80AA30DE13}.Android|Any CPU.ActiveCfg = Debug|x86
+               {2585188B-339D-44CD-9599-1A80AA30DE13}.Android|Mixed Platforms.ActiveCfg = Debug|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}.AppStore|Any CPU.ActiveCfg = Debug|x86
+               {2585188B-339D-44CD-9599-1A80AA30DE13}.AppStore|Mixed Platforms.ActiveCfg = Debug|x86
+               {2585188B-339D-44CD-9599-1A80AA30DE13}.AppStore|x86.ActiveCfg = Debug|x86
                {2585188B-339D-44CD-9599-1A80AA30DE13}.Debug|Any CPU.ActiveCfg = Debug|x86
                {2585188B-339D-44CD-9599-1A80AA30DE13}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
                {2585188B-339D-44CD-9599-1A80AA30DE13}.Debug|Mixed Platforms.Build.0 = Debug|x86
@@ -95,6 +99,9 @@ Global
                {8528C189-5B94-48F8-8C64-D4D6658E52F6}.Android|Mixed Platforms.ActiveCfg = Android|Any CPU
                {8528C189-5B94-48F8-8C64-D4D6658E52F6}.Android|Mixed Platforms.Build.0 = Android|Any CPU
                {8528C189-5B94-48F8-8C64-D4D6658E52F6}.Android|x86.ActiveCfg = Android|Any CPU
+               {8528C189-5B94-48F8-8C64-D4D6658E52F6}.AppStore|Any CPU.ActiveCfg = Android|Any CPU
+               {8528C189-5B94-48F8-8C64-D4D6658E52F6}.AppStore|Mixed Platforms.ActiveCfg = Android|Any CPU
+               {8528C189-5B94-48F8-8C64-D4D6658E52F6}.AppStore|x86.ActiveCfg = Android|Any CPU
                {8528C189-5B94-48F8-8C64-D4D6658E52F6}.Debug|Any CPU.ActiveCfg = PSM|Any CPU
                {8528C189-5B94-48F8-8C64-D4D6658E52F6}.Debug|Any CPU.Build.0 = PSM|Any CPU
                {8528C189-5B94-48F8-8C64-D4D6658E52F6}.Debug|Mixed Platforms.ActiveCfg = PSM|Any CPU
@@ -141,6 +148,9 @@ Global
                {B37AAC05-2F93-4061-AEF3-DABB11980C62}.Android|Mixed Platforms.Build.0 = Debug|Any CPU
                {B37AAC05-2F93-4061-AEF3-DABB11980C62}.Android|x86.ActiveCfg = Debug|Any CPU
                {B37AAC05-2F93-4061-AEF3-DABB11980C62}.Android|x86.Build.0 = Debug|Any CPU
+               {B37AAC05-2F93-4061-AEF3-DABB11980C62}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+               {B37AAC05-2F93-4061-AEF3-DABB11980C62}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU
+               {B37AAC05-2F93-4061-AEF3-DABB11980C62}.AppStore|x86.ActiveCfg = Release|Any CPU
                {B37AAC05-2F93-4061-AEF3-DABB11980C62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {B37AAC05-2F93-4061-AEF3-DABB11980C62}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {B37AAC05-2F93-4061-AEF3-DABB11980C62}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -192,6 +202,9 @@ Global
                {468F8415-7D38-4718-B0B4-E18F1A427136}.Android|Any CPU.ActiveCfg = Android|Any CPU
                {468F8415-7D38-4718-B0B4-E18F1A427136}.Android|Mixed Platforms.ActiveCfg = Android|Any CPU
                {468F8415-7D38-4718-B0B4-E18F1A427136}.Android|x86.ActiveCfg = Android|Any CPU
+               {468F8415-7D38-4718-B0B4-E18F1A427136}.AppStore|Any CPU.ActiveCfg = Android|Any CPU
+               {468F8415-7D38-4718-B0B4-E18F1A427136}.AppStore|Mixed Platforms.ActiveCfg = Android|Any CPU
+               {468F8415-7D38-4718-B0B4-E18F1A427136}.AppStore|x86.ActiveCfg = Android|Any CPU
                {468F8415-7D38-4718-B0B4-E18F1A427136}.Debug|Any CPU.ActiveCfg = PSM|Any CPU
                {468F8415-7D38-4718-B0B4-E18F1A427136}.Debug|Mixed Platforms.ActiveCfg = PSM|Any CPU
                {468F8415-7D38-4718-B0B4-E18F1A427136}.Debug|x86.ActiveCfg = PSM|Any CPU
@@ -216,12 +229,39 @@ 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
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.Android|Any CPU.ActiveCfg = AppStore|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.Android|Mixed Platforms.ActiveCfg = AppStore|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.Android|x86.ActiveCfg = AppStore|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}.AppStore|Mixed Platforms.ActiveCfg = AppStore|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.AppStore|x86.ActiveCfg = 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}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.Debug|x86.ActiveCfg = Debug|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.iOS|Any CPU.ActiveCfg = Release|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.iOS|Mixed Platforms.ActiveCfg = Release|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.iOS|x86.ActiveCfg = Release|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.Linux|Any CPU.ActiveCfg = Release|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.Linux|Mixed Platforms.ActiveCfg = Release|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.Linux|x86.ActiveCfg = Release|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.OSX|Any CPU.ActiveCfg = Release|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.OSX|Mixed Platforms.ActiveCfg = Release|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.OSX|x86.ActiveCfg = Release|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.PSM|Any CPU.ActiveCfg = Release|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.PSM|Mixed Platforms.ActiveCfg = Release|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.PSM|x86.ActiveCfg = Release|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
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.Release|x86.ActiveCfg = Release|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.Windows|Any CPU.ActiveCfg = Release|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.Windows|Mixed Platforms.ActiveCfg = Release|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.Windows|x86.ActiveCfg = Release|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.Windows8|Any CPU.ActiveCfg = Release|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.Windows8|Mixed Platforms.ActiveCfg = Release|Any CPU
+               {EE77A85A-089B-4055-90D0-6E08DF409410}.Windows8|x86.ActiveCfg = Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/SuperPolarity/SuperPolarity.csproj b/SuperPolarity/SuperPolarity.csproj
index 6dbd4ba2ad206025fbcd8100fbe102de1200c7da..16b091595f67c39198e5a8fb298a2a1b7247539d 100644 (file)
--- a/SuperPolarity/SuperPolarity.csproj
+++ b/SuperPolarity/SuperPolarity.csproj
@@ -52,6 +52,13 @@
   <ItemGroup>
     <Compile Include="ActorFactory.cs" />
     <Compile Include="ActorManager.cs" />
+    <Compile Include="Actors\GameActor.cs" />
+    <Compile Include="Actors\Generators\FanGenerator.cs" />
+    <Compile Include="Actors\Generators\Generator.cs" />
+    <Compile Include="Actors\Generators\LineGenerator.cs" />
+    <Compile Include="Actors\Generators\PointGenerator.cs" />
+    <Compile Include="Actors\Generators\RingGenerator.cs" />
+    <Compile Include="Actors\Generators\WaveGenerator.cs" />
     <Compile Include="Actors\StandardShip.cs" />
     <Compile Include="Actors\Bullet.cs" />
     <Compile Include="BasicGenerator.cs" />