backup/anx.framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

- updated ContentBuilder version

Browse Source 
- updated installer to add the ANX.Framework tools directory to the System-PATH. This is useful for compiling ContentProjects using the PreBuildAction of a Visual Studio project (this is used in the upcoming project templates)
This commit is contained in:
Glatzemann 2012-11-16 18:37:06 +00:00 committed by Konstantin Koch
parent ba75e9f7a4
commit 86936c2004
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Installer/anx.wxs
View File

@ -30,6 +30,18 @@
<UIRef Id="WixUI_InstallDir" />
<!--
<PropertyRef Id="VS2010_ITEMTEMPLATES_DIR" />
<PropertyRef Id="VS2010_PROJECTTEMPLATES_DIR" />
<PropertyRef Id="VS2012_ITEMTEMPLATES_DIR" />
<PropertyRef Id="VS2012_PROJECTTEMPLATES_DIR" />
<CustomAction Id="SetItemTemplatesPath2010" Directory="VS2010ITEMTEMPLATESDIR" Value="[VS2010_ITEMTEMPLATES_DIR]\ANX.Framework" />
<CustomAction Id="SetProjectTemplatesPath2010" Directory="VS2010PROJECTTEMPLATESDIR" Value="[VS2010_PROJECTTEMPLATES_DIR]\ANX.Framework" />
<CustomAction Id="SetItemTemplatesPath2012" Directory="VS2012ITEMTEMPLATESDIR" Value="[VS2012_ITEMTEMPLATES_DIR]\ANX.Framework" />
<CustomAction Id="SetProjectTemplatesPath2012" Directory="VS2012PROJECTTEMPLATESDIR" Value="[VS2012_PROJECTTEMPLATES_DIR]\ANX.Framework" />
-->
</Product>
<Fragment>
@ -86,6 +98,8 @@
<File Id='XNBInspector' Name='ANX.Tools.XNBInspector.exe' DiskId='1' Source='../bin/Release/ANX.Tools.XNBInspector.exe' />
<File Id='AnxSampleBrowser' Name='ANXSampleBrowser.exe' DiskId='1' Source='../bin/Release/ANXSampleBrowser.exe' />
<Environment Id='ToolsEnvironment' Name='PATH' Part='last' System='yes' Value='[TOOLSFOLDER]' Action='set' Permanent='no' />
<File Id='tools.anxcontentcompiler.anx.framework' Name='ANX.Framework.dll' DiskId='1' Source='../bin/Release/ANX.Framework.dll' />
<File Id='tools.anxcontentcompiler.anx.platformsystem.windows' Name='ANX.PlatformSystem.Windows.dll' DiskId='1' Source='../bin/Release/ANX.PlatformSystem.Windows.dll' />
<File Id='tools.anxcontentcompiler.anx.framework.contentpipeline' Name='ANX.Framework.Content.Pipeline.dll' DiskId='1' Source='../bin/Release/ANX.Framework.Content.Pipeline.dll' />
@ -112,21 +126,6 @@
<Verb Id='open' Command='Open' Argument='"%1"' />
</Extension>
</ProgId>
<File Id='tools.anxcontentcompiler.anx.framework' Name='ANX.Framework.dll' DiskId='1' Source='../bin/Release/ANX.Framework.dll' />
<File Id='tools.anxcontentcompiler.anx.platformsystem.windows' Name='ANX.PlatformSystem.Windows.dll' DiskId='1' Source='../bin/Release/ANX.PlatformSystem.Windows.dll' />
<File Id='tools.anxcontentcompiler.anx.framework.contentpipeline' Name='ANX.Framework.Content.Pipeline.dll' DiskId='1' Source='../bin/Release/ANX.Framework.Content.Pipeline.dll' />
<File Id='tools.anxcontentcompiler.anx.RenderSystem.windows.dx10' Name='ANX.RenderSystem.Windows.DX10.dll' DiskId='1' Source='../bin/Release/ANX.RenderSystem.Windows.DX10.dll' />
<File Id='tools.anxcontentcompiler.anx.inputsystem.standard' Name='ANX.InputSystem.Standard.dll' DiskId='1' Source='../bin/Release/ANX.InputSystem.Standard.dll' />
<File Id='tools.anxcontentcompiler.anx.inputdevices.windows.xinput' Name='ANX.InputDevices.Windows.XInput.dll' DiskId='1' Source='../bin/Release/ANX.InputDevices.Windows.XInput.dll' />
<File Id='tools.anxcontentcompiler.anx.soundsystem.windows.xaudio' Name='ANX.SoundSystem.Windows.XAudio.dll' DiskId='1' Source='../bin/Release/ANX.SoundSystem.Windows.XAudio.dll' />
<File Id='tools.anxcontentcompiler.sharpdx.d3dcompiler' Name='SharpDX.D3DCompiler.dll' DiskId='1' Source='../lib/SharpDX/Bin/Standard-net20/SharpDX.D3DCompiler.dll' />
<File Id='tools.anxcontentcompiler.sharpdx.direct3d10' Name='SharpDX.Direct3D10.dll' DiskId='1' Source='../lib/SharpDX/Bin/Standard-net20/SharpDX.Direct3D10.dll' />
<File Id='tools.anxcontentcompiler.sharpdx.directinput' Name='SharpDX.DirectInput.dll' DiskId='1' Source='../lib/SharpDX/Bin/Standard-net20/SharpDX.DirectInput.dll' />
<File Id='tools.anxcontentcompiler.sharpdx' Name='SharpDX.dll' DiskId='1' Source='../lib/SharpDX/Bin/Standard-net20/SharpDX.dll' />
<File Id='tools.anxcontentcompiler.sharpdx.dxgi' Name='SharpDX.DXGI.dll' DiskId='1' Source='../lib/SharpDX/Bin/Standard-net20/SharpDX.DXGI.dll' />
<File Id='tools.anxcontentcompiler.sharpdx.xaudio2' Name='SharpDX.XAudio2.dll' DiskId='1' Source='../lib/SharpDX/Bin/Standard-net20/SharpDX.XAudio2.dll' />
<File Id='tools.anxcontentcompiler.sharpdx.xinput' Name='SharpDX.XInput.dll' DiskId='1' Source='../lib/SharpDX/Bin/Standard-net20/SharpDX.XInput.dll' />
</Component>
</ComponentGroup>

3
Tools/ContentBuilder/Program.cs
View File

@ -6,6 +6,7 @@ using System.Text;
using ANX.Framework.Content.Pipeline.Tasks;
using ANX.Framework.Content.Pipeline;
using System.IO;
using System.Reflection;
#endregion
@ -26,6 +27,8 @@ namespace ContentBuilder
BuildContent buildContentTask = new BuildContent();
buildContentTask.BuildLogger = new ConsoleLogger();
buildContentTask.BuildLogger.LogMessage(String.Format("ANX.Framework {0} v{1}", Assembly.GetExecutingAssembly().GetName().Name, Assembly.GetExecutingAssembly().GetName().Version));
foreach (string arg in args)
{
if (!arg.StartsWith("/") && !arg.StartsWith("-"))

6
Tools/ContentBuilder/Properties/AssemblyInfo.cs
View File

@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
// Allgemeine Informationen über eine Assembly werden über die folgenden
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
// die mit einer Assembly verknüpft sind.
[assembly: AssemblyTitle("ContentBuilder")]
[assembly: AssemblyTitle("ANX.Framework ContentBuilder")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("ANX Developer Team")]
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.1.0.0")]
[assembly: AssemblyFileVersion("0.1.0.0")]
[assembly: AssemblyVersion("1.0.1.*")]
[assembly: AssemblyFileVersion("1.0.1.0")]