Browse Source

Added HIDAPI support from 'sdl2' module

seyhajin 6 years ago
parent
commit
e8f535462a

+ 1 - 1
modules/sdl2/SDL/include/SDL_config_windows.h

@@ -193,7 +193,7 @@ typedef unsigned int uintptr_t;
 /* Enable various input drivers */
 /* Enable various input drivers */
 #define SDL_JOYSTICK_DINPUT 1
 #define SDL_JOYSTICK_DINPUT 1
 #define SDL_JOYSTICK_XINPUT 1
 #define SDL_JOYSTICK_XINPUT 1
-#define SDL_JOYSTICK_HIDAPI 0 //!\\ sey was here! (from 1 to 0)
+#define SDL_JOYSTICK_HIDAPI 1
 #define SDL_HAPTIC_DINPUT   1
 #define SDL_HAPTIC_DINPUT   1
 #define SDL_HAPTIC_XINPUT   1
 #define SDL_HAPTIC_XINPUT   1
 
 

+ 11 - 0
modules/sdl2/makefile_windows.monkey2

@@ -4,6 +4,8 @@ Namespace sdl2
 #import "<libdsound.a>"
 #import "<libdsound.a>"
 #import "<libxinput.a>"
 #import "<libxinput.a>"
 #import "<libdinput8.a>"
 #import "<libdinput8.a>"
+#import "<libsetupapi.a>" 'v2.0.9
+#import "<libhid.a>" 'v2.0.9
 
 
 #import "<libadvapi32.a>"
 #import "<libadvapi32.a>"
 #import "<libole32.a>"
 #import "<libole32.a>"
@@ -75,6 +77,9 @@ Namespace sdl2
 #import "SDL/src/haptic/windows/SDL_dinputhaptic.c"
 #import "SDL/src/haptic/windows/SDL_dinputhaptic.c"
 #import "SDL/src/haptic/windows/SDL_xinputhaptic.c"
 #import "SDL/src/haptic/windows/SDL_xinputhaptic.c"
 
 
+'hidapi
+#import "SDL/src/hidapi/windows/hid.c" 'v2.0.9
+
 'joystick
 'joystick
 #import "SDL/src/joystick/SDL_joystick.c"
 #import "SDL/src/joystick/SDL_joystick.c"
 #Import "SDL/src/joystick/SDL_gamecontroller.c"
 #Import "SDL/src/joystick/SDL_gamecontroller.c"
@@ -84,6 +89,12 @@ Namespace sdl2
 #import "SDL/src/joystick/windows/SDL_xinputjoystick.c"
 #import "SDL/src/joystick/windows/SDL_xinputjoystick.c"
 #import "SDL/src/joystick/windows/SDL_mmjoystick.c" 'v2.0.9'
 #import "SDL/src/joystick/windows/SDL_mmjoystick.c" 'v2.0.9'
 
 
+#import "SDL/src/joystick/hidapi/SDL_hidapijoystick.c" 'v2.0.9'
+#import "SDL/src/joystick/hidapi/SDL_hidapi_ps4.c" 'v2.0.9'
+#import "SDL/src/joystick/hidapi/SDL_hidapi_switch.c" 'v2.0.9'
+#import "SDL/src/joystick/hidapi/SDL_hidapi_xbox360.c" 'v2.0.9'
+#import "SDL/src/joystick/hidapi/SDL_hidapi_xboxone.c" 'v2.0.9'
+
 'loadso
 'loadso
 #import "SDL/src/loadso/windows/SDL_sysloadso.c"
 #import "SDL/src/loadso/windows/SDL_sysloadso.c"