updated to the newest version of MonoGame

This commit is contained in:
Ell 2020-10-07 06:54:10 +02:00
parent 42549b4220
commit da40876e73
6 changed files with 23 additions and 10 deletions

2
.gitmodules vendored
View file

@ -1,3 +1,3 @@
[submodule "MonoGame"] [submodule "MonoGame"]
path = MonoGame path = MonoGame
url = https://github.com/Ellpeck/MonoGame url = https://github.com/MonoGame/MonoGame

View file

@ -2,10 +2,12 @@
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contentless", "Contentless\Contentless.csproj", "{A5C68D51-B404-44C9-8DD8-BAD4FD62A82D}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contentless", "Contentless\Contentless.csproj", "{A5C68D51-B404-44C9-8DD8-BAD4FD62A82D}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.Content.Pipeline.Windows", "MonoGame\MonoGame.Framework.Content.Pipeline\MonoGame.Framework.Content.Pipeline.Windows.csproj", "{B950DE10-AC5D-4BD9-B817-51247C4A732D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{58716AA9-5BCE-42C5-A0E7-D8B23C0488BA}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{58716AA9-5BCE-42C5-A0E7-D8B23C0488BA}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.Content.Pipeline", "MonoGame\MonoGame.Framework.Content.Pipeline\MonoGame.Framework.Content.Pipeline.csproj", "{A0BF6B94-5CF3-4456-AFEA-D956CF2AB92D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.DesktopGL", "MonoGame\MonoGame.Framework\MonoGame.Framework.DesktopGL.csproj", "{A8CFF376-58A8-41BB-8615-5232BB2B21EF}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -16,13 +18,17 @@ Global
{A5C68D51-B404-44C9-8DD8-BAD4FD62A82D}.Debug|Any CPU.Build.0 = Debug|Any CPU {A5C68D51-B404-44C9-8DD8-BAD4FD62A82D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A5C68D51-B404-44C9-8DD8-BAD4FD62A82D}.Release|Any CPU.ActiveCfg = Release|Any CPU {A5C68D51-B404-44C9-8DD8-BAD4FD62A82D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A5C68D51-B404-44C9-8DD8-BAD4FD62A82D}.Release|Any CPU.Build.0 = Release|Any CPU {A5C68D51-B404-44C9-8DD8-BAD4FD62A82D}.Release|Any CPU.Build.0 = Release|Any CPU
{B950DE10-AC5D-4BD9-B817-51247C4A732D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B950DE10-AC5D-4BD9-B817-51247C4A732D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B950DE10-AC5D-4BD9-B817-51247C4A732D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B950DE10-AC5D-4BD9-B817-51247C4A732D}.Release|Any CPU.Build.0 = Release|Any CPU
{58716AA9-5BCE-42C5-A0E7-D8B23C0488BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {58716AA9-5BCE-42C5-A0E7-D8B23C0488BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{58716AA9-5BCE-42C5-A0E7-D8B23C0488BA}.Debug|Any CPU.Build.0 = Debug|Any CPU {58716AA9-5BCE-42C5-A0E7-D8B23C0488BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{58716AA9-5BCE-42C5-A0E7-D8B23C0488BA}.Release|Any CPU.ActiveCfg = Release|Any CPU {58716AA9-5BCE-42C5-A0E7-D8B23C0488BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{58716AA9-5BCE-42C5-A0E7-D8B23C0488BA}.Release|Any CPU.Build.0 = Release|Any CPU {58716AA9-5BCE-42C5-A0E7-D8B23C0488BA}.Release|Any CPU.Build.0 = Release|Any CPU
{A0BF6B94-5CF3-4456-AFEA-D956CF2AB92D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A0BF6B94-5CF3-4456-AFEA-D956CF2AB92D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A0BF6B94-5CF3-4456-AFEA-D956CF2AB92D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A0BF6B94-5CF3-4456-AFEA-D956CF2AB92D}.Release|Any CPU.Build.0 = Release|Any CPU
{A8CFF376-58A8-41BB-8615-5232BB2B21EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A8CFF376-58A8-41BB-8615-5232BB2B21EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A8CFF376-58A8-41BB-8615-5232BB2B21EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A8CFF376-58A8-41BB-8615-5232BB2B21EF}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal

View file

@ -10,7 +10,10 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\MonoGame\MonoGame.Framework.Content.Pipeline\MonoGame.Framework.Content.Pipeline.Windows.csproj"> <ProjectReference Include="..\MonoGame\MonoGame.Framework.Content.Pipeline\MonoGame.Framework.Content.Pipeline.csproj">
<PrivateAssets>All</PrivateAssets>
</ProjectReference>
<ProjectReference Include="..\MonoGame\MonoGame.Framework\MonoGame.Framework.DesktopGL.csproj">
<PrivateAssets>All</PrivateAssets> <PrivateAssets>All</PrivateAssets>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>

View file

@ -9,7 +9,6 @@
<projectUrl>https://github.com/Ellpeck/Contentless</projectUrl> <projectUrl>https://github.com/Ellpeck/Contentless</projectUrl>
<licenseUrl>https://github.com/Ellpeck/Contentless/blob/master/LICENSE</licenseUrl> <licenseUrl>https://github.com/Ellpeck/Contentless/blob/master/LICENSE</licenseUrl>
<repository type="git" url="https://github.com/Ellpeck/Contentless"/> <repository type="git" url="https://github.com/Ellpeck/Contentless"/>
<readme>README.md</readme>
</metadata> </metadata>
<files> <files>
<file src="../README.md" target="README.md"/> <file src="../README.md" target="README.md"/>

@ -1 +1 @@
Subproject commit 133ef7c79d1e13152c543986e4335b6e01740ec4 Subproject commit 661de69369ecf0f4e078551b81836586bf6c2c67

View file

@ -55,3 +55,8 @@
/processor:TiledMapTilesetProcessor /processor:TiledMapTilesetProcessor
/build:Tiled/Tileset.tsx /build:Tiled/Tileset.tsx
#begin Textures/Exclude.png
/importer:TextureImporter
/processor:TextureProcessor
/build:Textures/Exclude.png