Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
61ed48edc3
4 changed files with 5 additions and 8 deletions
|
@ -16,11 +16,6 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
/* joystick support */
|
||||
#ifdef JOYSTICK_ENABLE
|
||||
# define JOYSTICK_AXIS_COUNT 2
|
||||
# define JOYSTICK_BUTTON_COUNT 1
|
||||
# define JOYSTICK_AXIS_RESOLUTION 8
|
||||
#endif
|
||||
#define JOYSTICK_BUTTON_COUNT 1
|
||||
|
||||
#define SPLIT_USB_DETECT
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue