TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Change joy_*_handler definitions back to macros for no joystick build in response to feedback

Browse source
This commit is contained in:
Chris Taylor 2016-11-06 14:04:04 +08:00
parent 8a8f11dc89
commit 219cf31381
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
common/include/joy.h
View file

@ -50,28 +50,19 @@ namespace dcx {
#if DXX_MAX_BUTTONS_PER_JOYSTICK #if DXX_MAX_BUTTONS_PER_JOYSTICK
extern window_event_result joy_button_handler(SDL_JoyButtonEvent *jbe); extern window_event_result joy_button_handler(SDL_JoyButtonEvent *jbe);
#else #else
static inline window_event_result joy_button_handler(void *) #define joy_button_handler(jbe) (static_cast<SDL_JoyButtonEvent *const &>(jbe), window_event_result::ignored)
{
return window_event_result::ignored;
}
#endif #endif
#if DXX_MAX_HATS_PER_JOYSTICK #if DXX_MAX_HATS_PER_JOYSTICK
extern window_event_result joy_hat_handler(SDL_JoyHatEvent *jhe); extern window_event_result joy_hat_handler(SDL_JoyHatEvent *jhe);
#else #else
static inline window_event_result joy_hat_handler(void *) #define joy_hat_handler(jbe) (static_cast<SDL_JoyHatEvent *const &>(jbe), window_event_result::ignored)
{
return window_event_result::ignored;
}
#endif #endif
#if DXX_MAX_AXES_PER_JOYSTICK #if DXX_MAX_AXES_PER_JOYSTICK
extern window_event_result joy_axis_handler(SDL_JoyAxisEvent *jae); extern window_event_result joy_axis_handler(SDL_JoyAxisEvent *jae);
#else #else
static inline window_event_result joy_axis_handler(void *) #define joy_axis_handler(jbe) (static_cast<SDL_JoyAxisEvent *const &>(jbe), window_event_result::ignored)
{
return window_event_result::ignored;
}
#endif #endif
} }