From 2b2534eb22934bc6a909d2921374cb615c118ec8 Mon Sep 17 00:00:00 2001 From: jianmingyong Date: Thu, 23 Mar 2017 12:59:48 +0800 Subject: [PATCH] New build config that uses multithread MGCB tool. --- .gitmodules | 3 + 2.5DHero/2.5DHero/2.5DHero.vbproj | 5 +- .../MonoGame.Content.Builder_Jian_New.targets | 99 +++++++++++++++++++ 2.5DHero/2.5DHero/Security/FileValidation.vb | 4 +- 2.5DHero_Jian_MGCB.sln | 39 ++++++++ Universal Content Builder | 1 + 6 files changed, 147 insertions(+), 4 deletions(-) create mode 100644 .gitmodules create mode 100644 2.5DHero/2.5DHero/MonoGame.Content.Builder_Jian_New.targets create mode 100644 2.5DHero_Jian_MGCB.sln create mode 160000 Universal Content Builder diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..390753b04 --- /dev/null +++ b/.gitmodules @@ -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 diff --git a/2.5DHero/2.5DHero/2.5DHero.vbproj b/2.5DHero/2.5DHero/2.5DHero.vbproj index d60cd28c5..b9bccb45a 100644 --- a/2.5DHero/2.5DHero/2.5DHero.vbproj +++ b/2.5DHero/2.5DHero/2.5DHero.vbproj @@ -27,13 +27,13 @@ false My Project\app.manifest - + true bin\DesktopGL\Debug\ DEBUG,TRACE,WINDOWS full - + bin\DesktopGL\Release\ TRACE,WINDOWS true @@ -1732,4 +1732,5 @@ + \ No newline at end of file diff --git a/2.5DHero/2.5DHero/MonoGame.Content.Builder_Jian_New.targets b/2.5DHero/2.5DHero/MonoGame.Content.Builder_Jian_New.targets new file mode 100644 index 000000000..64afbbaaa --- /dev/null +++ b/2.5DHero/2.5DHero/MonoGame.Content.Builder_Jian_New.targets @@ -0,0 +1,99 @@ + + + + + + + + + + + + true + + + + + + + $(ProjectDir)..\2.5DHeroContent\bin\$(MonoGamePlatform) + $(ProjectDir)..\2.5DHeroContent\obj\$(MonoGamePlatform) + + + /Library/Frameworks/Mono.framework/Versions/Current/bin/mono + /usr/local/bin/mono + /usr/bin/mono + mono + + $(ProjectDir)..\..\Universal Content Builder\Universal Content Builder\bin\Release\MGCB_Tool.exe + "$(MonoGameContentBuilderExe)" + $(MonoExe) $(MonoGameContentBuilderCmd) + + Resources\ + Assets\ + + + + + + + + + + + + + + + + + + + + + BuildContent; + $(BuildDependsOn); + + + + + + + + + + + + + + + + + + + + diff --git a/2.5DHero/2.5DHero/Security/FileValidation.vb b/2.5DHero/2.5DHero/Security/FileValidation.vb index 8ea2b3fa7..5032f7ad4 100644 --- a/2.5DHero/2.5DHero/Security/FileValidation.vb +++ b/2.5DHero/2.5DHero/Security/FileValidation.vb @@ -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 diff --git a/2.5DHero_Jian_MGCB.sln b/2.5DHero_Jian_MGCB.sln new file mode 100644 index 000000000..4c43cd970 --- /dev/null +++ b/2.5DHero_Jian_MGCB.sln @@ -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 diff --git a/Universal Content Builder b/Universal Content Builder new file mode 160000 index 000000000..7f3efac44 --- /dev/null +++ b/Universal Content Builder @@ -0,0 +1 @@ +Subproject commit 7f3efac44a447bf18c95197aa980b030dde10d47