Commit e6c640f31419ff60144a667b9d42e33298181b37
2020-04-13T08:18:16
Enable the virtual joystick API by default
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123
diff --git a/include/SDL_config_android.h b/include/SDL_config_android.h
index d057e17..471edb4 100644
--- a/include/SDL_config_android.h
+++ b/include/SDL_config_android.h
@@ -136,8 +136,9 @@
/* Enable various input drivers */
#define SDL_JOYSTICK_ANDROID 1
-#define SDL_JOYSTICK_HIDAPI 1
-#define SDL_HAPTIC_ANDROID 1
+#define SDL_JOYSTICK_HIDAPI 1
+#define SDL_JOYSTICK_VIRTUAL 1
+#define SDL_HAPTIC_ANDROID 1
/* Enable sensor driver */
#define SDL_SENSOR_ANDROID 1
diff --git a/include/SDL_config_iphoneos.h b/include/SDL_config_iphoneos.h
index 38929a8..f3b74a6 100644
--- a/include/SDL_config_iphoneos.h
+++ b/include/SDL_config_iphoneos.h
@@ -137,8 +137,9 @@
#define SDL_HAPTIC_DUMMY 1
/* Enable MFi joystick support */
-#define SDL_JOYSTICK_MFI 1
#define SDL_JOYSTICK_HIDAPI 1
+#define SDL_JOYSTICK_MFI 1
+#define SDL_JOYSTICK_VIRTUAL 1
#ifdef __TVOS__
#define SDL_SENSOR_DUMMY 1
diff --git a/include/SDL_config_macosx.h b/include/SDL_config_macosx.h
index 1141345..42cba74 100644
--- a/include/SDL_config_macosx.h
+++ b/include/SDL_config_macosx.h
@@ -139,8 +139,9 @@
#define SDL_AUDIO_DRIVER_DUMMY 1
/* Enable various input drivers */
+#define SDL_JOYSTICK_HIDAPI 1
#define SDL_JOYSTICK_IOKIT 1
-#define SDL_JOYSTICK_HIDAPI 1
+#define SDL_JOYSTICK_VIRTUAL 1
#define SDL_HAPTIC_IOKIT 1
/* Enable the dummy sensor driver */
diff --git a/include/SDL_config_os2.h b/include/SDL_config_os2.h
index f5799dc..eedf79c 100644
--- a/include/SDL_config_os2.h
+++ b/include/SDL_config_os2.h
@@ -31,7 +31,6 @@
#define SDL_POWER_DISABLED 1
#define SDL_JOYSTICK_DISABLED 1
#define SDL_HAPTIC_DISABLED 1
-/*#undef SDL_JOYSTICK_HIDAPI */
#define SDL_SENSOR_DUMMY 1
#define SDL_VIDEO_DRIVER_DUMMY 1
diff --git a/include/SDL_config_pandora.h b/include/SDL_config_pandora.h
index bdc64c9..6328b96 100644
--- a/include/SDL_config_pandora.h
+++ b/include/SDL_config_pandora.h
@@ -112,6 +112,7 @@
#define SDL_INPUT_LINUXEV 1
#define SDL_INPUT_TSLIB 1
#define SDL_JOYSTICK_LINUX 1
+#define SDL_JOYSTICK_VIRTUAL 1
#define SDL_HAPTIC_LINUX 1
#define SDL_SENSOR_DUMMY 1
diff --git a/include/SDL_config_psp.h b/include/SDL_config_psp.h
index 0cbb182..235fe08 100644
--- a/include/SDL_config_psp.h
+++ b/include/SDL_config_psp.h
@@ -136,6 +136,7 @@
/* Enable the PSP joystick driver (src/joystick/psp/\*.c) */
#define SDL_JOYSTICK_PSP 1
+#define SDL_JOYSTICK_VIRTUAL 1
/* Enable the dummy sensor driver */
#define SDL_SENSOR_DUMMY 1
diff --git a/include/SDL_config_windows.h b/include/SDL_config_windows.h
index c3097bb..0f242d9 100644
--- a/include/SDL_config_windows.h
+++ b/include/SDL_config_windows.h
@@ -195,9 +195,10 @@ typedef unsigned int uintptr_t;
/* Enable various input drivers */
#define SDL_JOYSTICK_DINPUT 1
-#define SDL_JOYSTICK_XINPUT 1
#define SDL_JOYSTICK_HIDAPI 1
-#define SDL_JOYSTICK_RAWINPUT 1
+#define SDL_JOYSTICK_RAWINPUT 1
+#define SDL_JOYSTICK_VIRTUAL 1
+#define SDL_JOYSTICK_XINPUT 1
#define SDL_HAPTIC_DINPUT 1
#define SDL_HAPTIC_XINPUT 1
diff --git a/include/SDL_config_winrt.h b/include/SDL_config_winrt.h
index fa03389..dc936d3 100644
--- a/include/SDL_config_winrt.h
+++ b/include/SDL_config_winrt.h
@@ -193,6 +193,7 @@ typedef unsigned int uintptr_t;
#define SDL_JOYSTICK_DISABLED 1
#define SDL_HAPTIC_DISABLED 1
#else
+#define SDL_JOYSTICK_VIRTUAL 1
#define SDL_JOYSTICK_XINPUT 1
#define SDL_HAPTIC_XINPUT 1
#endif
diff --git a/include/SDL_config_wiz.h b/include/SDL_config_wiz.h
index 92b1771..80ca13c 100644
--- a/include/SDL_config_wiz.h
+++ b/include/SDL_config_wiz.h
@@ -128,6 +128,7 @@
#define SDL_INPUT_LINUXEV 1
#define SDL_INPUT_TSLIB 1
#define SDL_JOYSTICK_LINUX 1
+#define SDL_JOYSTICK_VIRTUAL 1
#define SDL_HAPTIC_LINUX 1
#define SDL_SENSOR_DUMMY 1