Explorar o código

Add Tetris example to Linux Sample solution

kjpou1 %!s(int64=13) %!d(string=hai) anos
pai
achega
caf8fca6ba

+ 22 - 16
Samples/Linux/Tetris/MonoGame.Samples.Tetris.Linux.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -9,7 +9,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Tetris</RootNamespace>
     <AssemblyName>Tetris</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -40,12 +40,6 @@
     <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\MacOS\Tetris\Content\tetris.png">
-      <Link>Content\tetris.png</Link>
-    </None>
-    <None Include="..\..\MacOS\Tetris\Content\score.png">
-      <Link>Content\score.png</Link>
-    </None>
     <None Include="..\..\MacOS\Tetris\Content\font.spritefont">
       <Link>Content\font.spritefont</Link>
     </None>
@@ -55,12 +49,6 @@
     <None Include="..\..\MacOS\Tetris\Content\background.psd">
       <Link>Content\background.psd</Link>
     </None>
-    <None Include="..\..\MacOS\Tetris\Content\background.png">
-      <Link>Content\background.png</Link>
-    </None>
-    <None Include="..\..\MacOS\Tetris\Content\Arial.xnb">
-      <Link>Content\Arial.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\Tetris\Info.plist">
       <Link>Info.plist</Link>
     </None>
@@ -85,12 +73,30 @@
     <Compile Include="Engine.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+    <Folder Include="Content\" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Name>MonoGame.Framework.Linux</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Content\" />
+    <Content Include="..\..\MacOS\Tetris\Content\Arial.xnb">
+      <Link>Content\Arial.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\Tetris\Content\background.png">
+      <Link>Content\background.png</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\Tetris\Content\tetris.png">
+      <Link>Content\tetris.png</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\Tetris\Content\score.png">
+      <Link>Content\score.png</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 </Project>

+ 23 - 1
Samples/MonoGame.Samples.Linux.sln

@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network.Linux", "..
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.NetRumble.Linux", "Linux\NetRumble\MonoGame.Samples.NetRumble.Linux.csproj", "{52735207-2136-433B-A3E4-4C082728EED8}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.Tetris.Linux", "Linux\Tetris\MonoGame.Samples.Tetris.Linux.csproj", "{86A619E2-C8F0-452B-B762-C69D5BB07C98}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -65,6 +67,26 @@ Global
 		{52735207-2136-433B-A3E4-4C082728EED8}.Release|Mixed Platforms.Build.0 = Release|x86
 		{52735207-2136-433B-A3E4-4C082728EED8}.Release|x86.ActiveCfg = Release|x86
 		{52735207-2136-433B-A3E4-4C082728EED8}.Release|x86.Build.0 = Release|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Debug|Any CPU.Build.0 = Debug|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Debug|iPhone.ActiveCfg = Debug|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Debug|iPhone.Build.0 = Debug|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Debug|iPhoneSimulator.Build.0 = Debug|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Debug|x86.ActiveCfg = Debug|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Debug|x86.Build.0 = Debug|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Release|Any CPU.ActiveCfg = Release|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Release|Any CPU.Build.0 = Release|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Release|iPhone.ActiveCfg = Release|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Release|iPhone.Build.0 = Release|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Release|Mixed Platforms.Build.0 = Release|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Release|x86.ActiveCfg = Release|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Release|x86.Build.0 = Release|x86
 		{86A619E2-C8F0-452B-B764-C69D5BB07C98}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{86A619E2-C8F0-452B-B764-C69D5BB07C98}.Debug|Any CPU.Build.0 = Debug|x86
 		{86A619E2-C8F0-452B-B764-C69D5BB07C98}.Debug|iPhone.ActiveCfg = Debug|x86
@@ -127,7 +149,7 @@ Global
 		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = Linux\NetRumble\MonoGame.Samples.NetRumble.Linux.csproj
+		StartupItem = Linux\Tetris\MonoGame.Samples.Tetris.Linux.csproj
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE