Browse Source

Fix problem with duplicate project

Kenneth Pouncey 13 years ago
parent
commit
342e514608

+ 2 - 2
Samples/MacOS/CatapultNetWars/CatapultNetWars.csproj

@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1F4BF77D-34DA-417D-96DE-24213A05729B}</ProjectGuid>
+    <ProjectGuid>{1F4BF87D-34DA-417D-96DE-24213A05739B}</ProjectGuid>
     <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>CatapultGame</RootNamespace>
@@ -47,7 +47,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\..\Users\Jimmy\Public\Share\MonoMacSource\kjpgit\MonoGame\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
       <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
       <Name>MonoGame.Framework.MacOS</Name>
     </ProjectReference>

+ 20 - 0
Samples/MonoGame.Samples.MacOS.sln

@@ -81,6 +81,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UseCustomVertex", "MacOS\Us
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CatapaultGame", "MacOS\CatapaultWars\CatapaultGame.csproj", "{1F4BF77D-34DA-417D-96DE-24213A05729B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CatapultNetWars", "MacOS\CatapultNetWars\CatapultNetWars.csproj", "{1F4BF87D-34DA-417D-96DE-24213A05739B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -162,6 +164,24 @@ Global
 		{1F4BF77D-34DA-417D-96DE-24213A05729B}.Release|iPhoneSimulator.Build.0 = Release|x86
 		{1F4BF77D-34DA-417D-96DE-24213A05729B}.Release|x86.ActiveCfg = Release|x86
 		{1F4BF77D-34DA-417D-96DE-24213A05729B}.Release|x86.Build.0 = Release|x86
+		{1F4BF87D-34DA-417D-96DE-24213A05739B}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{1F4BF87D-34DA-417D-96DE-24213A05739B}.Debug|Any CPU.Build.0 = Debug|x86
+		{1F4BF87D-34DA-417D-96DE-24213A05739B}.Debug|iPhone.ActiveCfg = Debug|x86
+		{1F4BF87D-34DA-417D-96DE-24213A05739B}.Debug|iPhone.Build.0 = Debug|x86
+		{1F4BF87D-34DA-417D-96DE-24213A05739B}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{1F4BF87D-34DA-417D-96DE-24213A05739B}.Debug|iPhoneSimulator.Build.0 = Debug|x86
+		{1F4BF87D-34DA-417D-96DE-24213A05739B}.Debug|x86.ActiveCfg = Debug|x86
+		{1F4BF87D-34DA-417D-96DE-24213A05739B}.Debug|x86.Build.0 = Debug|x86
+		{1F4BF87D-34DA-417D-96DE-24213A05739B}.Distribution|Any CPU.ActiveCfg = Debug|x86
+		{1F4BF87D-34DA-417D-96DE-24213A05739B}.Distribution|Any CPU.Build.0 = Debug|x86
+		{1F4BF87D-34DA-417D-96DE-24213A05739B}.Release|Any CPU.ActiveCfg = Release|x86
+		{1F4BF87D-34DA-417D-96DE-24213A05739B}.Release|Any CPU.Build.0 = Release|x86
+		{1F4BF87D-34DA-417D-96DE-24213A05739B}.Release|iPhone.ActiveCfg = Release|x86
+		{1F4BF87D-34DA-417D-96DE-24213A05739B}.Release|iPhone.Build.0 = Release|x86
+		{1F4BF87D-34DA-417D-96DE-24213A05739B}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{1F4BF87D-34DA-417D-96DE-24213A05739B}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{1F4BF87D-34DA-417D-96DE-24213A05739B}.Release|x86.ActiveCfg = Release|x86
+		{1F4BF87D-34DA-417D-96DE-24213A05739B}.Release|x86.Build.0 = Release|x86
 		{27C1B777-4E37-4E2B-9CE4-5FDEE8CD9C40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{27C1B777-4E37-4E2B-9CE4-5FDEE8CD9C40}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{27C1B777-4E37-4E2B-9CE4-5FDEE8CD9C40}.Debug|x86.ActiveCfg = Debug|Any CPU

+ 8 - 1
Samples/iOS/Catapults/MonoGame.Samples.CatapultWars.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
+    <DefineConstants>DEBUG; IOS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -61,6 +61,7 @@
     <Reference Include="System.Core" />
     <Reference Include="monotouch" />
     <Reference Include="OpenTK" />
+    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Info.plist" />
@@ -236,4 +237,10 @@
       <Link>Background.png</Link>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
+      <Project>{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}</Project>
+      <Name>MonoGame.Framework.iOS</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>