From 0506606efcd2173bb33dc9ef2b3bd1ea85c14b0d Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Sun, 21 Jun 2009 02:08:50 +0000 Subject: [PATCH] - Added I_GetAxes() stub for the SDL side. - Added oleaut32.lib as an explicit library in the VC Proj, since the 2005 Express Edition doesn't include it implicitly the way the other versions do. SVN r1673 (trunk) --- src/sdl/i_input.cpp | 8 ++++++++ src/sdl/i_input.h | 11 +---------- zdoom.vcproj | 8 ++++---- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/sdl/i_input.cpp b/src/sdl/i_input.cpp index e7fc32ebf7..78754d19e4 100644 --- a/src/sdl/i_input.cpp +++ b/src/sdl/i_input.cpp @@ -460,3 +460,11 @@ void I_StartFrame () InitKeySymMap (); } } + +void I_GetAxes(float axes[NUM_JOYAXIS]) +{ + for (int i = 0; i < NUM_JOYAXIS; ++i) + { + axes[i] = 0; + } +} diff --git a/src/sdl/i_input.h b/src/sdl/i_input.h index 2551159bab..cfbf476d91 100644 --- a/src/sdl/i_input.h +++ b/src/sdl/i_input.h @@ -4,16 +4,7 @@ void I_PutInClipboard (const char *str); FString I_GetFromClipboard (bool use_primary_selection); -struct GUIDName -{ - GUID ID; - char *Name; -}; - -extern TArray JoystickNames; -extern char *JoyAxisNames[8]; - -extern void DI_EnumJoy (); +void I_GetAxes(float axes[NUM_JOYAXIS]); #endif diff --git a/zdoom.vcproj b/zdoom.vcproj index 18108eb304..b979a9bfab 100644 --- a/zdoom.vcproj +++ b/zdoom.vcproj @@ -91,7 +91,7 @@