From d0dbd56aab066d43e9939d9815be38fbb330d956 Mon Sep 17 00:00:00 2001 From: Glatzemann Date: Fri, 27 Jan 2012 17:15:57 +0000 Subject: [PATCH] - fixed some build errors in ANX.InputSystem.Recording when using the CLI MSBuild tasks - improved the installer and added a start menu folder with ANX2XNA Converter, ANXStatusComparer, ANX.Framework website and a uninstall link --- .../ANX.InputSystem.Recording/Creator.cs | 2 + .../RecordingMotionSensingDevice.cs | 11 ++-- Installer/anx.wxs | 54 +++++++++++++++++-- build/ANX.Framework.build | 5 +- 4 files changed, 60 insertions(+), 12 deletions(-) diff --git a/InputSystems/ANX.InputSystem.Recording/Creator.cs b/InputSystems/ANX.InputSystem.Recording/Creator.cs index f291371b..ebd9e499 100644 --- a/InputSystems/ANX.InputSystem.Recording/Creator.cs +++ b/InputSystems/ANX.InputSystem.Recording/Creator.cs @@ -62,7 +62,9 @@ namespace ANX.InputSystem.Recording RecordingMouse mouse; RecordingKeyboard keyboard; RecordingGamePad gamePad; +#if XNAEXT RecordingMotionSensingDevice msd; +#endif public IGamePad GamePad { diff --git a/InputSystems/ANX.InputSystem.Recording/RecordingMotionSensingDevice.cs b/InputSystems/ANX.InputSystem.Recording/RecordingMotionSensingDevice.cs index ba65c734..5c65b644 100644 --- a/InputSystems/ANX.InputSystem.Recording/RecordingMotionSensingDevice.cs +++ b/InputSystems/ANX.InputSystem.Recording/RecordingMotionSensingDevice.cs @@ -1,13 +1,13 @@ -#if XNAEXT - -#region Using Statements +#region Using Statements using System; using System.Collections.Generic; using System.Linq; using System.Text; using ANX.Framework.NonXNA; using ANX.Framework.Graphics; +#if XNAEXT using ANX.Framework.Input.MotionSensing; +#endif #endregion @@ -60,6 +60,8 @@ using ANX.Framework.Input.MotionSensing; namespace ANX.InputSystem.Recording { +#if XNAEXT + /// /// Wrapper aroung another IMotionSensingDevice, will record all inputs and allows playback. /// @@ -92,6 +94,5 @@ namespace ANX.InputSystem.Recording throw new NotImplementedException(); } } +#endif } - -#endif \ No newline at end of file diff --git a/Installer/anx.wxs b/Installer/anx.wxs index 660b6be2..f34e6fca 100644 --- a/Installer/anx.wxs +++ b/Installer/anx.wxs @@ -1,5 +1,6 @@ - + + + + + + @@ -27,12 +33,50 @@ - + + + - - + + + + + - + + + + + + + + + + + + + + + + + + + + diff --git a/build/ANX.Framework.build b/build/ANX.Framework.build index b518160c..2b1ff93a 100644 --- a/build/ANX.Framework.build +++ b/build/ANX.Framework.build @@ -144,6 +144,7 @@ + @@ -387,7 +388,7 @@ - + @@ -402,7 +403,7 @@ warningsaserrors="true" suppressices="ICE57" cultures="en-us" - extensions="WixUIExtension" + extensions="WixUIExtension;WiXUtilExtension" rebuild="true" suppresspdb="true">