Added new configs

2017-02-16 17:22:16 +03:00 · 2017-02-16 17:22:16 +03:00 · 5c03804407
parent ba1a5f4f38
commit 5c03804407
4 changed files with 128 additions and 9 deletions
--- a/2.5DHero.sln
+++ b/2.5DHero.sln
@ -7,17 +7,26 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "2.5DHero", "2.5DHero\2.5DHe
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
+		DebugJian|Any CPU = DebugJian|Any CPU
 		DebugNoContent|Any CPU = DebugNoContent|Any CPU
-		Release|Any CPU = Release|Any CPU
+		DebugStandard|Any CPU = DebugStandard|Any CPU
+		ReleaseJian|Any CPU = ReleaseJian|Any CPU
+		ReleaseNoContent|Any CPU = ReleaseNoContent|Any CPU
+		ReleaseStandard|Any CPU = ReleaseStandard|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugJian|Any CPU.ActiveCfg = DebugJian|Any CPU
+		{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugJian|Any CPU.Build.0 = DebugJian|Any CPU
 		{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugNoContent|Any CPU.ActiveCfg = DebugNoContent|Any CPU
 		{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugNoContent|Any CPU.Build.0 = DebugNoContent|Any CPU
-		{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugStandard|Any CPU.ActiveCfg = DebugStandard|Any CPU
+		{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugStandard|Any CPU.Build.0 = DebugStandard|Any CPU
+		{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseJian|Any CPU.ActiveCfg = ReleaseJian|Any CPU
+		{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseJian|Any CPU.Build.0 = ReleaseJian|Any CPU
+		{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseNoContent|Any CPU.ActiveCfg = ReleaseNoContent|Any CPU
+		{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseNoContent|Any CPU.Build.0 = ReleaseNoContent|Any CPU
+		{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseStandard|Any CPU.ActiveCfg = ReleaseStandard|Any CPU
+		{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseStandard|Any CPU.Build.0 = ReleaseStandard|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/2.5DHero/2.5DHero/2.5DHero.vbproj
+++ b/2.5DHero/2.5DHero/2.5DHero.vbproj
@ -27,13 +27,13 @@
    <Prefer32Bit>false</Prefer32Bit>
    <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug' Or '$(Configuration)' == 'DebugNoContent'">
+  <PropertyGroup Condition="'$(Configuration)' == 'DebugNoContent' Or '$(Configuration)' == 'DebugStandard' Or '$(Configuration)' == 'DebugJian'">
    <DebugSymbols>true</DebugSymbols>
    <OutputPath>bin\DesktopGL\Debug\</OutputPath>
    <DefineConstants>DEBUG,TRACE,WINDOWS</DefineConstants>
    <DebugType>full</DebugType>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+  <PropertyGroup Condition="'$(Configuration)' == 'ReleaseNoContent' Or '$(Configuration)' == 'ReleaseStandard' Or '$(Configuration)' == 'ReleaseJian'">
    <OutputPath>bin\DesktopGL\Release\</OutputPath>
    <DefineConstants>TRACE,WINDOWS</DefineConstants>
    <Optimize>true</Optimize>
@ -1727,5 +1727,6 @@
    </CreateProperty>
  </Target>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-  <Import Condition=" '$(Configuration)' != 'DebugNoContent' " Project="MonoGame.Content.Builder.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" />
 </Project>
--- a/2.5DHero/2.5DHero/MonoGame.Content.Builder_Jian.targets
+++ b/2.5DHero/2.5DHero/MonoGame.Content.Builder_Jian.targets
--- a/2.5DHero/2.5DHero/MonoGame.Content.Builder_Standard.targets
+++ b/2.5DHero/2.5DHero/MonoGame.Content.Builder_Standard.targets
@ -0,0 +1,109 @@
+<!--
+  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)' == ''">$(MSBuildExtensionsPath)\MonoGame\v3.0\Tools\MGCB.exe</MonoGameContentBuilderExe>
+      <MonoGameContentBuilderCmd>&quot;$(MonoGameContentBuilderExe)&quot;</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>
+
+      <Header>/platform:$(MonoGamePlatform) /outputDir:&quot;$(ParentOutputDir)&quot; /intermediateDir:&quot;$(ParentIntermediateDir)&quot; /quiet</Header>
+    </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, 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)' != 'PlayStationMobile' And       
+			'$(MonoGamePlatform)' != 'WindowsPhone8' And       
+			'$(MonoGamePlatform)' != 'RaspberryPi' And       
+			'$(MonoGamePlatform)' != 'PlayStation4' And       
+			'$(MonoGamePlatform)' != 'PSVita' And       
+			'$(MonoGamePlatform)' != 'XboxOne' And       
+			'$(MonoGamePlatform)' != 'WindowsGL'" />
+
+    <Error
+        Text="The MonoGame content builder executable could not be located at '$(MonoGameContentBuilderExe)'!"
+        Condition="!Exists('$(MonoGameContentBuilderExe)')"
+      />
+
+    <Warning
+        Text="No Content References Found. Please make sure your .mgcb file has a build action of MonoGameContentReference"
+        Condition=" '%(ContentReferences.FullPath)' == '' "
+    />
+
+    <MakeDir Directories="$(ParentIntermediateDir)"/>
+    <MakeDir Directories="$(ParentOutputDir)"/>
+
+  </Target>
+
+  <PropertyGroup>
+    <BuildDependsOn>
+      BuildContent;
+      $(BuildDependsOn);
+    </BuildDependsOn>
+  </PropertyGroup>
+
+  <Target Name="RunContentBuilder">
+    <Exec Condition=" '%(ContentReferences.FullPath)' != '' " Command="$(MonoGameContentBuilderCmd) /@:&quot;%(ContentReferences.FullPath)&quot; $(Header)"
+          WorkingDirectory="%(ContentReferences.RootDir)%(ContentReferences.Directory)" />
+
+    <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>