- applied patch #13368 of clcrutch (fixes XInput's Keyboard.GetState(PlayerIndex) to match XNA's functionality)
- added build support for "Visual Studio 2012 Express for Windows Desktop" using the MakeAnxFramework command - marked patches in source files
This commit is contained in:
parent
695ce34937
commit
0daa7c04f9
@ -9,6 +9,14 @@ using ANX.Framework.NonXNA.Development;
|
||||
// "ANX.Framework developer group" and released under the Ms-PL license.
|
||||
// For details see: http://anxframework.codeplex.com/license
|
||||
|
||||
#region Patch-Log
|
||||
/*
|
||||
|
||||
* 12/03/2012 #13365 clcrutch
|
||||
|
||||
*/
|
||||
#endregion
|
||||
|
||||
namespace ANX.Framework
|
||||
{
|
||||
[PercentageComplete(100)]
|
||||
|
@ -14,6 +14,13 @@ using ANX.Framework.NonXNA.SoundSystem;
|
||||
// "ANX.Framework developer group" and released under the Ms-PL license.
|
||||
// For details see: http://anxframework.codeplex.com/license
|
||||
|
||||
#region Patch-Log
|
||||
/*
|
||||
|
||||
* 12/03/2012 #13365 clcrutch
|
||||
|
||||
*/
|
||||
#endregion
|
||||
|
||||
namespace ANX.Framework
|
||||
{
|
||||
|
@ -9,6 +9,14 @@ using ANX.Framework.NonXNA.Development;
|
||||
// "ANX.Framework developer group" and released under the Ms-PL license.
|
||||
// For details see: http://anxframework.codeplex.com/license
|
||||
|
||||
#region Patch-Log
|
||||
/*
|
||||
|
||||
* 12/03/2012 #13365 clcrutch
|
||||
|
||||
*/
|
||||
#endregion
|
||||
|
||||
namespace ANX.InputDevices.Windows.XInput
|
||||
{
|
||||
[PercentageComplete(100)]
|
||||
@ -51,11 +59,18 @@ namespace ANX.InputDevices.Windows.XInput
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Only available on XBox, behaviour regarding MSDN: empty keystate
|
||||
/// Although MSDN states this method returns an emtpy state on Windows,
|
||||
/// Xna functionality has it returning Keyboard.GetState() for PlayerIndex.One.
|
||||
/// </summary>
|
||||
public KeyboardState GetState(PlayerIndex playerIndex)
|
||||
{
|
||||
return emptyState;
|
||||
switch (playerIndex)
|
||||
{
|
||||
case PlayerIndex.One:
|
||||
return GetState();
|
||||
default:
|
||||
return emptyState;
|
||||
}
|
||||
}
|
||||
|
||||
public KeyboardState GetState()
|
||||
|
@ -73,6 +73,8 @@
|
||||
<property name="project.anx.psvita" value="true" />
|
||||
<property name="project.anx.platform" value="PS Vita" />
|
||||
|
||||
<property name="build.dir.base" value="${build.dir}/${project.anx.platform}" />
|
||||
|
||||
<call target="generate_project_files" />
|
||||
</target>
|
||||
|
||||
@ -93,6 +95,8 @@
|
||||
<property name="project.anx.platform" value="Windows 8 / Metro / WinRT" />
|
||||
<property name="build.platform" value="ARM" />
|
||||
|
||||
<property name="build.dir.base" value="${build.dir}/WinRT" />
|
||||
|
||||
<property name="project.anx.directives" value="${project.anx.directives} WINDOWSMETRO ARM WINRT" />
|
||||
|
||||
<call target="generate_project_files" />
|
||||
|
@ -4,6 +4,7 @@ set ProgRoot=%ProgramFiles%
|
||||
if not "%ProgramFiles(x86)%" == "" set ProgRoot=%ProgramFiles(x86)%
|
||||
|
||||
FOR /F "tokens=2* delims= " %%A IN ('REG QUERY "HKEY_USERS\.DEFAULT\Software\Microsoft\VisualStudio\11.0_Config" /v ShellFolder') DO SET vs11dir=%%B
|
||||
FOR /F "tokens=2* delims= " %%A IN ('REG QUERY "HKEY_USERS\.DEFAULT\Software\Microsoft\WDExpress\11.0_Config" /v ShellFolder') DO SET vs11dir=%%B
|
||||
FOR /F "tokens=2* delims= " %%A IN ('REG QUERY "HKEY_USERS\.DEFAULT\Software\Microsoft\VisualStudio\10.0_Config" /v ShellFolder') DO SET vs10dir=%%B
|
||||
|
||||
if EXIST "%vs11dir%\vc\vcvarsall.bat" goto vs2011
|
||||
@ -20,7 +21,7 @@ goto error_msg
|
||||
SET ENV=VS2012
|
||||
goto start_nant
|
||||
|
||||
:vs2011pf
|
||||
:vs2010pf
|
||||
SET vs10dir = %ProgRoot%\Microsoft Visual Studio 10.0\
|
||||
:vs2010
|
||||
echo Visual Studio 2010 build environment
|
||||
@ -28,6 +29,14 @@ goto error_msg
|
||||
SET ENV=VS2010
|
||||
goto start_nant
|
||||
|
||||
:vs2008pf
|
||||
SET vs9dir = %ProgRoot%\Microsoft Visual Studio 9.0\
|
||||
:vs2010
|
||||
echo Visual Studio 2008 build environment
|
||||
call "%vs9dir%\vc\vcvarsall.bat" x86
|
||||
SET ENV=VS2008
|
||||
goto start_nant
|
||||
|
||||
:start_nant
|
||||
if NOT EXIST "../build" goto error_msg_working_dir
|
||||
set PATH=../lib/nant-0.91/bin;../Tools/bin;%PATH%
|
||||
|
Loading…
x
Reference in New Issue
Block a user