[Windows] Xbox controller name mismatch #567

matlo · Jun 10, 2018 · b89dbaf · b89dbaf
1 parent af6423d
commit b89dbaf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/shared/gimxcontroller/include/x360.h b/shared/gimxcontroller/include/x360.h
@@ -14,7 +14,7 @@
 #ifndef WIN32
 #define X360_NAME "Microsoft X-Box 360 pad"
 #else
-#define X360_NAME "X360 Controller"
+#define X360_NAME "XInput Controller"
 #endif
 
 #define X360_USB_INTERRUPT_ENDPOINT_IN 1

diff --git a/shared/gimxcontroller/include/xone.h b/shared/gimxcontroller/include/xone.h
@@ -11,7 +11,11 @@
 #define XONE_VENDOR 0x045e
 #define XONE_PRODUCT 0x02d1
 
+#ifndef WIN32
 #define XONE_NAME "Microsoft X-Box One pad"
+#else
+#define XONE_NAME "XInput Controller"
+#endif
 
 #define XONE_USB_INTERRUPT_ENDPOINT_IN 1
 #define XONE_USB_INTERRUPT_ENDPOINT_OUT 1

diff --git a/shared/gimxinput b/shared/gimxinput
+1 −11		include/ginput.h
+13 −63		src/ginput.c
+19 −1		src/linux/js.c