New build config that uses multithread MGCB tool.
This commit is contained in:
jianmingyong
parent
0910fdadf6
commit
2b2534eb22
|
|
@ -0,0 +1,3 @@
|
|||
[submodule "Universal Content Builder"]
|
||||
path = Universal Content Builder
|
||||
url = https://github.com/AGN-Pokemon-3D/Pokemon-3D-Universal-Content-Builder.git
|
||||
|
|
@ -27,13 +27,13 @@
|
|||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<ApplicationManifest>My Project\app.manifest</ApplicationManifest>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)' == 'DebugNoContent' Or '$(Configuration)' == 'DebugStandard' Or '$(Configuration)' == 'DebugJian'">
|
||||
<PropertyGroup Condition="'$(Configuration)' == 'DebugNoContent' Or '$(Configuration)' == 'DebugStandard' Or '$(Configuration)' == 'DebugJian' Or '$(Configuration)' == 'DebugJianNew'">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>bin\DesktopGL\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG,TRACE,WINDOWS</DefineConstants>
|
||||
<DebugType>full</DebugType>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)' == 'ReleaseNoContent' Or '$(Configuration)' == 'ReleaseStandard' Or '$(Configuration)' == 'ReleaseJian'">
|
||||
<PropertyGroup Condition="'$(Configuration)' == 'ReleaseNoContent' Or '$(Configuration)' == 'ReleaseStandard' Or '$(Configuration)' == 'ReleaseJian' Or '$(Configuration)' == 'ReleaseJianNew'">
|
||||
<OutputPath>bin\DesktopGL\Release\</OutputPath>
|
||||
<DefineConstants>TRACE,WINDOWS</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
|
|
@ -1732,4 +1732,5 @@
|
|||
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
||||
<Import Condition=" '$(Configuration)' == 'DebugStandard' Or '$(Configuration)' == 'ReleaseStandard' " Project="MonoGame.Content.Builder_Standard.targets" />
|
||||
<Import Condition=" '$(Configuration)' == 'DebugJian' Or '$(Configuration)' == 'ReleaseJian' " Project="MonoGame.Content.Builder_Jian.targets" />
|
||||
<Import Condition=" '$(Configuration)' == 'DebugJianNew' Or '$(Configuration)' == 'ReleaseJianNew' " Project="MonoGame.Content.Builder_Jian_New.targets" />
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,99 @@
|
|||
<!--
|
||||
MonoGame - Copyright (C) The MonoGame Team
|
||||
This file is subject to the terms and conditions defined in
|
||||
file 'LICENSE.txt', which is part of this source code package.
|
||||
-->
|
||||
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
|
||||
<!-- Add MonoGameContentReference to item type selection in Visual Studio -->
|
||||
<ItemGroup>
|
||||
<AvailableItemName Include="MonoGameContentReference" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- This disables the IDE feature that skips executing msbuild in some build situations. -->
|
||||
<PropertyGroup>
|
||||
<DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="Prepare">
|
||||
|
||||
<PropertyGroup>
|
||||
|
||||
<ParentOutputDir Condition=" '$(ParentOutputDir)' == '' " >$(ProjectDir)..\2.5DHeroContent\bin\$(MonoGamePlatform)</ParentOutputDir>
|
||||
<ParentIntermediateDir Condition=" '$(ParentIntermediateDir)' == '' " >$(ProjectDir)..\2.5DHeroContent\obj\$(MonoGamePlatform)</ParentIntermediateDir>
|
||||
|
||||
<!-- El Capitan Support -->
|
||||
<MonoExe Condition=" '$(OS)' != 'Windows_NT' And Exists ('/Library/Frameworks/Mono.framework/Versions/Current/bin/mono') ">/Library/Frameworks/Mono.framework/Versions/Current/bin/mono</MonoExe>
|
||||
<MonoExe Condition=" '$(OS)' != 'Windows_NT' And Exists ('/usr/local/bin/mono') ">/usr/local/bin/mono</MonoExe>
|
||||
<MonoExe Condition=" '$(OS)' != 'Windows_NT' And Exists ('/usr/bin/mono') ">/usr/bin/mono</MonoExe>
|
||||
<MonoExe Condition=" '$(OS)' != 'Windows_NT' And '$(MonoExe)' == '' ">mono</MonoExe>
|
||||
|
||||
<MonoGameContentBuilderExe Condition="'$(MonoGameContentBuilderExe)' == ''">$(ProjectDir)..\..\Universal Content Builder\Universal Content Builder\bin\Release\MGCB_Tool.exe</MonoGameContentBuilderExe>
|
||||
<MonoGameContentBuilderCmd>"$(MonoGameContentBuilderExe)"</MonoGameContentBuilderCmd>
|
||||
<MonoGameContentBuilderCmd Condition=" '$(OS)' != 'Windows_NT' ">$(MonoExe) $(MonoGameContentBuilderCmd)</MonoGameContentBuilderCmd>
|
||||
|
||||
<PlatformResourcePrefix Condition="'$(MonoGamePlatform)' == 'MacOSX' Or '$(MonoGamePlatform)' == 'iOS'">Resources\</PlatformResourcePrefix>
|
||||
<PlatformResourcePrefix Condition="'$(MonoGamePlatform)' == 'Android'">Assets\</PlatformResourcePrefix>
|
||||
<PlatformResourcePrefix Condition="'$(PlatformResourcePrefix)' == ''"></PlatformResourcePrefix>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Get all Mono Game Content References and store them in a list -->
|
||||
<!-- We do this here so we are compatible with xbuild -->
|
||||
<ItemGroup>
|
||||
<ContentReferences Include="@(MonoGameContentReference)"/>
|
||||
</ItemGroup>
|
||||
|
||||
<Error Text="The MonoGamePlatform property was not defined in the project! It must be set to Windows, WindowsGL, WindowsStoreApp, WindowsPhone8, MacOSX, iOS, Linux, DesktopGL, RaspberryPi, Android, Ouya, NativeClient, PlayStation4, or PlayStationMobile."
|
||||
Condition=" '$(MonoGamePlatform)' != 'Windows' And
|
||||
'$(MonoGamePlatform)' != 'iOS' And
|
||||
'$(MonoGamePlatform)' != 'Android' And
|
||||
'$(MonoGamePlatform)' != 'Linux' And
|
||||
'$(MonoGamePlatform)' != 'DesktopGL' And
|
||||
'$(MonoGamePlatform)' != 'MacOSX' And
|
||||
'$(MonoGamePlatform)' != 'WindowsStoreApp' And
|
||||
'$(MonoGamePlatform)' != 'NativeClient' And
|
||||
'$(MonoGamePlatform)' != 'Ouya' And
|
||||
'$(MonoGamePlatform)' != 'PlayStationMobile' And
|
||||
'$(MonoGamePlatform)' != 'WindowsPhone8' And
|
||||
'$(MonoGamePlatform)' != 'RaspberryPi' And
|
||||
'$(MonoGamePlatform)' != 'PlayStation4' And
|
||||
'$(MonoGamePlatform)' != 'WindowsGL'" />
|
||||
|
||||
<Error
|
||||
Text="The MonoGame content builder executable could not be located at '$(MonoGameContentBuilderExe)'!"
|
||||
Condition="!Exists('$(MonoGameContentBuilderExe)')"
|
||||
/>
|
||||
|
||||
<MakeDir Directories="$(ParentIntermediateDir)"/>
|
||||
<MakeDir Directories="$(ParentOutputDir)"/>
|
||||
|
||||
</Target>
|
||||
|
||||
<PropertyGroup>
|
||||
<BuildDependsOn>
|
||||
BuildContent;
|
||||
$(BuildDependsOn);
|
||||
</BuildDependsOn>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="RunContentBuilder">
|
||||
<Exec Condition=" '$(OS)' == 'Windows_NT' " Command="$(MonoGameContentBuilderCmd) "/OutputDir:'$(ParentOutputDir)'" "/IntermediateDir:'$(ParentIntermediateDir)'" /Platform:$(MonoGamePlatform) /Profile:Reach /Compress:True /GenerateMeta:True" WorkingDirectory="$(ProjectDir)..\2.5DHeroContent" />
|
||||
|
||||
<CreateItem Include="$(ParentOutputDir)\**\*.*">
|
||||
<Output TaskParameter="Include" ItemName="ExtraContent" />
|
||||
</CreateItem>
|
||||
</Target>
|
||||
|
||||
<Target Name="BuildContent" DependsOnTargets="Prepare;RunContentBuilder"
|
||||
Outputs="%(ExtraContent.RecursiveDir)%(ExtraContent.Filename)%(ExtraContent.Extension)">
|
||||
<CreateItem Include="$(ParentOutputDir)\%(ExtraContent.RecursiveDir)%(ExtraContent.Filename)%(ExtraContent.Extension)"
|
||||
AdditionalMetadata="Link=$(PlatformResourcePrefix)$(ContentRootDirectory)\%(ExtraContent.RecursiveDir)%(ExtraContent.Filename)%(ExtraContent.Extension);CopyToOutputDirectory=PreserveNewest"
|
||||
Condition="'%(ExtraContent.Filename)' != ''">
|
||||
<Output TaskParameter="Include" ItemName="Content" Condition="'$(MonoGamePlatform)' != 'Android' And '$(MonoGamePlatform)' != 'iOS' And '$(MonoGamePlatform)' != 'MacOSX'" />
|
||||
<Output TaskParameter="Include" ItemName="BundleResource" Condition="'$(MonoGamePlatform)' == 'MacOSX' Or '$(MonoGamePlatform)' == 'iOS'" />
|
||||
<Output TaskParameter="Include" ItemName="AndroidAsset" Condition="'$(MonoGamePlatform)' == 'Android'" />
|
||||
</CreateItem>
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
|
|
@ -6,8 +6,8 @@
|
|||
Shared _valid As Boolean = False
|
||||
|
||||
Const RUNVALIDATION As Boolean = False
|
||||
Const EXPECTEDSIZE As Integer = 42417354
|
||||
Const METAHASH As String = "RUM3N0U1REM0NzREQjkzRUU2MEE1NDk2MUQxNDU5NDU="
|
||||
Const EXPECTEDSIZE As Integer = 42418205
|
||||
Const METAHASH As String = "QzQwOTRCNDJENDE2Q0Y0RDkwNUVFQkU2Njg1ODYyQzI="
|
||||
|
||||
Public Shared ReadOnly Property IsValid(ByVal ForceResult As Boolean) As Boolean
|
||||
Get
|
||||
|
|
|
|||
|
|
@ -0,0 +1,39 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.26228.9
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "2.5DHero", "2.5DHero\2.5DHero\2.5DHero.vbproj", "{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{EE057806-FAE2-4F37-B85B-A5DE693E6E79} = {EE057806-FAE2-4F37-B85B-A5DE693E6E79}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Universal Content Builder", "Universal Content Builder\Universal Content Builder\Universal Content Builder.csproj", "{EE057806-FAE2-4F37-B85B-A5DE693E6E79}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
DebugJian|MonoGame 3.5.1 = DebugJian|MonoGame 3.5.1
|
||||
DebugNoContent|MonoGame 3.5.1 = DebugNoContent|MonoGame 3.5.1
|
||||
ReleaseJian|MonoGame 3.5.1 = ReleaseJian|MonoGame 3.5.1
|
||||
ReleaseNoContent|MonoGame 3.5.1 = ReleaseNoContent|MonoGame 3.5.1
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugJian|MonoGame 3.5.1.ActiveCfg = DebugJianNew|Any CPU
|
||||
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugJian|MonoGame 3.5.1.Build.0 = DebugJianNew|Any CPU
|
||||
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugNoContent|MonoGame 3.5.1.ActiveCfg = DebugNoContent|Any CPU
|
||||
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugNoContent|MonoGame 3.5.1.Build.0 = DebugNoContent|Any CPU
|
||||
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseJian|MonoGame 3.5.1.ActiveCfg = ReleaseJianNew|Any CPU
|
||||
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseJian|MonoGame 3.5.1.Build.0 = ReleaseJianNew|Any CPU
|
||||
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseNoContent|MonoGame 3.5.1.ActiveCfg = ReleaseNoContent|Any CPU
|
||||
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseNoContent|MonoGame 3.5.1.Build.0 = ReleaseNoContent|Any CPU
|
||||
{EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugJian|MonoGame 3.5.1.ActiveCfg = MonoGame|3.5.1
|
||||
{EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugJian|MonoGame 3.5.1.Build.0 = MonoGame|3.5.1
|
||||
{EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugNoContent|MonoGame 3.5.1.ActiveCfg = MonoGame|3.5.1
|
||||
{EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseJian|MonoGame 3.5.1.ActiveCfg = MonoGame|3.5.1
|
||||
{EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseJian|MonoGame 3.5.1.Build.0 = MonoGame|3.5.1
|
||||
{EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseNoContent|MonoGame 3.5.1.ActiveCfg = MonoGame|3.5.1
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 7f3efac44a447bf18c95197aa980b030dde10d47
|
||||
Loading…
Reference in New Issue