aboutsummaryrefslogtreecommitdiff
path: root/guilib/common
diff options
context:
space:
mode:
authormaestrodd <maestrodd@svn>2009-10-07 22:33:04 +0000
committermaestrodd <maestrodd@svn>2009-10-07 22:33:04 +0000
commitbca49d2f4ffd1ca0e1c1d1e853cdb8726c79377e (patch)
treede0f7b3a637f1e2637f39cfd7e936a133e2e13fa /guilib/common
parentd4a2c93c77fd5eac66ba311e63142f6dcf8b9263 (diff)
fixed: AppleRemote
- AppleRemote is currently recognized as a joystick and thus needs Joystick processing in CApplication - make JACTIVE_AXIS defines available even if SDL_JOYSTICK isn't defined git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@23524 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib/common')
-rw-r--r--guilib/common/SDLJoystick.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/guilib/common/SDLJoystick.h b/guilib/common/SDLJoystick.h
index 7f4f23500a..53e37f8874 100644
--- a/guilib/common/SDLJoystick.h
+++ b/guilib/common/SDLJoystick.h
@@ -5,6 +5,11 @@
#include <vector>
#include <string>
+#define JACTIVE_BUTTON 0x00000001
+#define JACTIVE_AXIS 0x00000002
+#define JACTIVE_HAT 0x00000004
+#define JACTIVE_NONE 0x00000000
+
#ifdef HAS_SDL_JOYSTICK
#include <SDL/SDL_joystick.h>
@@ -12,10 +17,6 @@
#define MAX_AXES 64
-#define JACTIVE_BUTTON 0x00000001
-#define JACTIVE_AXIS 0x00000002
-#define JACTIVE_HAT 0x00000004
-#define JACTIVE_NONE 0x00000000
// Class to manage all connected joysticks