From: Ben Beltran Date: Sat, 31 May 2014 18:20:39 +0000 (-0500) Subject: Re-include the mac project in the main solution X-Git-Url: https://git.r.bdr.sh/rbdr/super-polarity/commitdiff_plain/fdba5d09e95b2614be8fdb89b80ebd1854e5705c?ds=inline;hp=05e4b948df39b47d33067049cf51fd3be7749031 Re-include the mac project in the main solution --- diff --git a/SuperPolarity.sln b/SuperPolarity.sln index 6ee66e4..9115f5a 100644 --- 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 +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 @@ -40,10 +42,11 @@ 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|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 @@ -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 + {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 - StartupItem = SuperPolarity\SuperPolarity.csproj + StartupItem = SuperPolarity\SuperPolarityMac\SuperPolarityMac.csproj EndGlobalSection EndGlobal diff --git a/SuperPolarity.userprefs b/SuperPolarity.userprefs index 695350a..4fdd746 100644 --- a/SuperPolarity.userprefs +++ b/SuperPolarity.userprefs @@ -1,10 +1,10 @@ - + - + - + diff --git a/SuperPolarity/Actors/Generators/Generator.cs b/SuperPolarity/Actors/Generators/Generator.cs index 4e2cc3e..8267dc0 100644 --- a/SuperPolarity/Actors/Generators/Generator.cs +++ b/SuperPolarity/Actors/Generators/Generator.cs @@ -1,4 +1,5 @@ using System; +using Microsoft.Xna.Framework; namespace SuperPolarity { diff --git a/SuperPolarityMac/SuperPolarityMac.userprefs b/SuperPolarityMac/SuperPolarityMac.userprefs index 9c0cef4..e2d5d0c 100644 --- a/SuperPolarityMac/SuperPolarityMac.userprefs +++ b/SuperPolarityMac/SuperPolarityMac.userprefs @@ -1,16 +1,15 @@ - + - + - - - - - - - - - + + + + + + + +