Commit 1bd120266f1fce1f0f0badf53cae92183e8ec50b
2020-02-04T15:42:49
Added SDL_hidapi_rumble.c to the macOS, iOS and tvOS builds
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 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322
diff --git a/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj b/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj
index 78e75a6..ae4dce1 100755
--- a/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj
+++ b/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj
@@ -367,6 +367,13 @@
A704173220F7F39900A82227 /* SDL_hidapi_steam.c in Sources */ = {isa = PBXBuildFile; fileRef = A704173020F7F39400A82227 /* SDL_hidapi_steam.c */; };
A75FDAB723E288E400529352 /* SDL_hidapi_steam.c in Sources */ = {isa = PBXBuildFile; fileRef = A704173020F7F39400A82227 /* SDL_hidapi_steam.c */; };
A75FDAB823E2890000529352 /* SDL_hidapi_steam.c in Sources */ = {isa = PBXBuildFile; fileRef = A704173020F7F39400A82227 /* SDL_hidapi_steam.c */; };
+ A75FDBD923EA38AD00529352 /* SDL_hidapi_rumble.c in Sources */ = {isa = PBXBuildFile; fileRef = A75FDBD723EA38AD00529352 /* SDL_hidapi_rumble.c */; };
+ A75FDBDA23EA38AD00529352 /* SDL_hidapi_rumble.c in Sources */ = {isa = PBXBuildFile; fileRef = A75FDBD723EA38AD00529352 /* SDL_hidapi_rumble.c */; };
+ A75FDBDB23EA38AD00529352 /* SDL_hidapi_rumble.c in Sources */ = {isa = PBXBuildFile; fileRef = A75FDBD723EA38AD00529352 /* SDL_hidapi_rumble.c */; };
+ A75FDBDC23EA38AD00529352 /* SDL_hidapi_rumble.c in Sources */ = {isa = PBXBuildFile; fileRef = A75FDBD723EA38AD00529352 /* SDL_hidapi_rumble.c */; };
+ A75FDBDD23EA38AD00529352 /* SDL_hidapi_rumble.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDBD823EA38AD00529352 /* SDL_hidapi_rumble.h */; };
+ A75FDBDE23EA38AD00529352 /* SDL_hidapi_rumble.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDBD823EA38AD00529352 /* SDL_hidapi_rumble.h */; };
+ A75FDBDF23EA38AD00529352 /* SDL_hidapi_rumble.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDBD823EA38AD00529352 /* SDL_hidapi_rumble.h */; };
A7C19D29212E552C00DF2152 /* SDL_displayevents_c.h in Headers */ = {isa = PBXBuildFile; fileRef = A7C19D27212E552B00DF2152 /* SDL_displayevents_c.h */; };
A7C19D2A212E552C00DF2152 /* SDL_displayevents.c in Sources */ = {isa = PBXBuildFile; fileRef = A7C19D28212E552B00DF2152 /* SDL_displayevents.c */; };
A7C19D2B212E552C00DF2152 /* SDL_displayevents.c in Sources */ = {isa = PBXBuildFile; fileRef = A7C19D28212E552B00DF2152 /* SDL_displayevents.c */; };
@@ -984,6 +991,8 @@
93CB792513FC5F5300BD3E05 /* SDL_uikitviewcontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_uikitviewcontroller.m; sourceTree = "<group>"; };
A704172D20F7E74800A82227 /* controller_type.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = controller_type.h; sourceTree = "<group>"; };
A704173020F7F39400A82227 /* SDL_hidapi_steam.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_hidapi_steam.c; sourceTree = "<group>"; };
+ A75FDBD723EA38AD00529352 /* SDL_hidapi_rumble.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_hidapi_rumble.c; sourceTree = "<group>"; };
+ A75FDBD823EA38AD00529352 /* SDL_hidapi_rumble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_hidapi_rumble.h; sourceTree = "<group>"; };
A7C19D27212E552B00DF2152 /* SDL_displayevents_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_displayevents_c.h; sourceTree = "<group>"; };
A7C19D28212E552B00DF2152 /* SDL_displayevents.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_displayevents.c; sourceTree = "<group>"; };
A7FF6B6123AC3BC6005876C6 /* SDL_hidapi_gamecube.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_hidapi_gamecube.c; sourceTree = "<group>"; };
@@ -1484,6 +1493,8 @@
children = (
A7FF6B6123AC3BC6005876C6 /* SDL_hidapi_gamecube.c */,
F3BDD78E20F51CB8004ECBF3 /* SDL_hidapi_ps4.c */,
+ A75FDBD723EA38AD00529352 /* SDL_hidapi_rumble.c */,
+ A75FDBD823EA38AD00529352 /* SDL_hidapi_rumble.h */,
A704173020F7F39400A82227 /* SDL_hidapi_steam.c */,
F3BDD78C20F51CB8004ECBF3 /* SDL_hidapi_switch.c */,
F3BDD78B20F51CB8004ECBF3 /* SDL_hidapi_xbox360.c */,
@@ -1989,6 +2000,7 @@
52ED1DD5222889500061FCE0 /* SDL_syswm.h in Headers */,
52ED1DD6222889500061FCE0 /* SDL_thread.h in Headers */,
52ED1DD7222889500061FCE0 /* SDL_timer.h in Headers */,
+ A75FDBDE23EA38AD00529352 /* SDL_hidapi_rumble.h in Headers */,
52ED1DD8222889500061FCE0 /* SDL_touch.h in Headers */,
52ED1DD9222889500061FCE0 /* SDL_types.h in Headers */,
52ED1DDA222889500061FCE0 /* SDL_version.h in Headers */,
@@ -2125,6 +2137,7 @@
F3E3C6C32241389A007D243C /* SDL_syswm.h in Headers */,
F3E3C6C42241389A007D243C /* SDL_thread.h in Headers */,
F3E3C6C52241389A007D243C /* SDL_timer.h in Headers */,
+ A75FDBDF23EA38AD00529352 /* SDL_hidapi_rumble.h in Headers */,
F3E3C6C62241389A007D243C /* SDL_touch.h in Headers */,
F3E3C6C72241389A007D243C /* SDL_types.h in Headers */,
F3E3C6C82241389A007D243C /* SDL_version.h in Headers */,
@@ -2262,6 +2275,7 @@
AA7558C31595D55500BBD41B /* SDL_syswm.h in Headers */,
AA7558C41595D55500BBD41B /* SDL_thread.h in Headers */,
AA7558C51595D55500BBD41B /* SDL_timer.h in Headers */,
+ A75FDBDD23EA38AD00529352 /* SDL_hidapi_rumble.h in Headers */,
AA7558C61595D55500BBD41B /* SDL_touch.h in Headers */,
AA7558C71595D55500BBD41B /* SDL_types.h in Headers */,
AA7558C81595D55500BBD41B /* SDL_version.h in Headers */,
@@ -2536,6 +2550,7 @@
52ED1E1C222889500061FCE0 /* SDL_stretch.c in Sources */,
52ED1E1D222889500061FCE0 /* SDL_egl.c in Sources */,
52ED1E1E222889500061FCE0 /* SDL_surface.c in Sources */,
+ A75FDBDA23EA38AD00529352 /* SDL_hidapi_rumble.c in Sources */,
52ED1E1F222889500061FCE0 /* SDL_video.c in Sources */,
52ED1E20222889500061FCE0 /* SDL_nullevents.c in Sources */,
52ED1E21222889500061FCE0 /* SDL_nullvideo.c in Sources */,
@@ -2668,6 +2683,7 @@
F3E3C70A2241389A007D243C /* SDL_stretch.c in Sources */,
F3E3C70B2241389A007D243C /* SDL_egl.c in Sources */,
F3E3C70C2241389A007D243C /* SDL_surface.c in Sources */,
+ A75FDBDC23EA38AD00529352 /* SDL_hidapi_rumble.c in Sources */,
F3E3C70D2241389A007D243C /* SDL_video.c in Sources */,
F3E3C70E2241389A007D243C /* SDL_nullevents.c in Sources */,
F3E3C70F2241389A007D243C /* SDL_nullvideo.c in Sources */,
@@ -2774,6 +2790,7 @@
FAB5984B1BB5C31600BE72C5 /* SDL_sysfilesystem.m in Sources */,
AADC5A5D1FDA104400960936 /* yuv_rgb.c in Sources */,
FAB5984C1BB5C31600BE72C5 /* SDL_syshaptic.c in Sources */,
+ A75FDBDB23EA38AD00529352 /* SDL_hidapi_rumble.c in Sources */,
AADC5A5F1FDA105600960936 /* SDL_vulkan_utils.c in Sources */,
AADC5A5E1FDA105300960936 /* SDL_yuv.c in Sources */,
FAB5984D1BB5C31600BE72C5 /* SDL_haptic.c in Sources */,
@@ -2922,6 +2939,7 @@
FDA684640DF2374E00F98A1A /* SDL_stretch.c in Sources */,
AA13B34D1FB8B27800D9FEE6 /* SDL_egl.c in Sources */,
FDA684660DF2374E00F98A1A /* SDL_surface.c in Sources */,
+ A75FDBD923EA38AD00529352 /* SDL_hidapi_rumble.c in Sources */,
FDA684680DF2374E00F98A1A /* SDL_video.c in Sources */,
FDA685FB0DF244C800F98A1A /* SDL_nullevents.c in Sources */,
FDA685FF0DF244C800F98A1A /* SDL_nullvideo.c in Sources */,
diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
index 3cf281e..f8fee59 100755
--- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj
+++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
@@ -947,6 +947,24 @@
A75FDBBA23E4CBC700529352 /* ReadMe.txt in Resources */ = {isa = PBXBuildFile; fileRef = F59C710300D5CB5801000001 /* ReadMe.txt */; };
A75FDBBB23E4CBC800529352 /* License.txt in Resources */ = {isa = PBXBuildFile; fileRef = 00794D3F09D0C461003FC8A1 /* License.txt */; };
A75FDBBC23E4CBC800529352 /* ReadMe.txt in Resources */ = {isa = PBXBuildFile; fileRef = F59C710300D5CB5801000001 /* ReadMe.txt */; };
+ A75FDBC523EA380300529352 /* SDL_hidapi_rumble.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDBC323EA380300529352 /* SDL_hidapi_rumble.h */; };
+ A75FDBC623EA380300529352 /* SDL_hidapi_rumble.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDBC323EA380300529352 /* SDL_hidapi_rumble.h */; };
+ A75FDBC723EA380300529352 /* SDL_hidapi_rumble.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDBC323EA380300529352 /* SDL_hidapi_rumble.h */; };
+ A75FDBC823EA380300529352 /* SDL_hidapi_rumble.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDBC323EA380300529352 /* SDL_hidapi_rumble.h */; };
+ A75FDBC923EA380300529352 /* SDL_hidapi_rumble.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDBC323EA380300529352 /* SDL_hidapi_rumble.h */; };
+ A75FDBCA23EA380300529352 /* SDL_hidapi_rumble.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDBC323EA380300529352 /* SDL_hidapi_rumble.h */; };
+ A75FDBCB23EA380300529352 /* SDL_hidapi_rumble.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDBC323EA380300529352 /* SDL_hidapi_rumble.h */; };
+ A75FDBCC23EA380300529352 /* SDL_hidapi_rumble.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDBC323EA380300529352 /* SDL_hidapi_rumble.h */; };
+ A75FDBCD23EA380300529352 /* SDL_hidapi_rumble.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDBC323EA380300529352 /* SDL_hidapi_rumble.h */; };
+ A75FDBCE23EA380300529352 /* SDL_hidapi_rumble.c in Sources */ = {isa = PBXBuildFile; fileRef = A75FDBC423EA380300529352 /* SDL_hidapi_rumble.c */; };
+ A75FDBCF23EA380300529352 /* SDL_hidapi_rumble.c in Sources */ = {isa = PBXBuildFile; fileRef = A75FDBC423EA380300529352 /* SDL_hidapi_rumble.c */; };
+ A75FDBD023EA380300529352 /* SDL_hidapi_rumble.c in Sources */ = {isa = PBXBuildFile; fileRef = A75FDBC423EA380300529352 /* SDL_hidapi_rumble.c */; };
+ A75FDBD123EA380300529352 /* SDL_hidapi_rumble.c in Sources */ = {isa = PBXBuildFile; fileRef = A75FDBC423EA380300529352 /* SDL_hidapi_rumble.c */; };
+ A75FDBD223EA380300529352 /* SDL_hidapi_rumble.c in Sources */ = {isa = PBXBuildFile; fileRef = A75FDBC423EA380300529352 /* SDL_hidapi_rumble.c */; };
+ A75FDBD323EA380300529352 /* SDL_hidapi_rumble.c in Sources */ = {isa = PBXBuildFile; fileRef = A75FDBC423EA380300529352 /* SDL_hidapi_rumble.c */; };
+ A75FDBD423EA380300529352 /* SDL_hidapi_rumble.c in Sources */ = {isa = PBXBuildFile; fileRef = A75FDBC423EA380300529352 /* SDL_hidapi_rumble.c */; };
+ A75FDBD523EA380300529352 /* SDL_hidapi_rumble.c in Sources */ = {isa = PBXBuildFile; fileRef = A75FDBC423EA380300529352 /* SDL_hidapi_rumble.c */; };
+ A75FDBD623EA380300529352 /* SDL_hidapi_rumble.c in Sources */ = {isa = PBXBuildFile; fileRef = A75FDBC423EA380300529352 /* SDL_hidapi_rumble.c */; };
A769B08423E259AE00872273 /* SDL_shaders_metal_tvos.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A8E323E2514000DCD162 /* SDL_shaders_metal_tvos.h */; };
A769B08523E259AE00872273 /* SDL_filesystem.h in Headers */ = {isa = PBXBuildFile; fileRef = 567E2F2017C44C35005F1892 /* SDL_filesystem.h */; settings = {ATTRIBUTES = (Public, ); }; };
A769B08723E259AE00872273 /* begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C71595D4D800BBD41B /* begin_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -3985,6 +4003,8 @@
A75FDBA523E4CB6F00529352 /* LICENSE-orig.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "LICENSE-orig.txt"; sourceTree = "<group>"; };
A75FDBA623E4CB6F00529352 /* LICENSE-gpl3.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "LICENSE-gpl3.txt"; sourceTree = "<group>"; };
A75FDBA723E4CB6F00529352 /* LICENSE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE.txt; sourceTree = "<group>"; };
+ A75FDBC323EA380300529352 /* SDL_hidapi_rumble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_hidapi_rumble.h; sourceTree = "<group>"; };
+ A75FDBC423EA380300529352 /* SDL_hidapi_rumble.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_hidapi_rumble.c; sourceTree = "<group>"; };
A769B23D23E259AE00872273 /* libSDL2.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSDL2.a; sourceTree = BUILT_PRODUCTS_DIR; };
A77E6EB3167AB0A90010E40B /* SDL_gamecontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_gamecontroller.h; sourceTree = "<group>"; };
A7D88B5423E2437C00DCD162 /* SDL2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDL2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -5279,9 +5299,11 @@
A7D8A7BE23E2513E00DCD162 /* hidapi */ = {
isa = PBXGroup;
children = (
- A75FDAAC23E2795C00529352 /* SDL_hidapi_steam.c */,
A7D8A7C923E2513E00DCD162 /* SDL_hidapi_gamecube.c */,
A7D8A7C323E2513E00DCD162 /* SDL_hidapi_ps4.c */,
+ A75FDBC423EA380300529352 /* SDL_hidapi_rumble.c */,
+ A75FDBC323EA380300529352 /* SDL_hidapi_rumble.h */,
+ A75FDAAC23E2795C00529352 /* SDL_hidapi_steam.c */,
A7D8A7C623E2513E00DCD162 /* SDL_hidapi_switch.c */,
A7D8A7C223E2513E00DCD162 /* SDL_hidapi_xbox360.c */,
A7D8A7C823E2513E00DCD162 /* SDL_hidapi_xbox360w.c */,
@@ -5699,6 +5721,7 @@
A75FCD3423E25AB700529352 /* blank_cursor.h in Headers */,
A75FDB5F23E39E6100529352 /* hidapi.h in Headers */,
A75FCD3523E25AB700529352 /* SDL_gesture.h in Headers */,
+ A75FDBCC23EA380300529352 /* SDL_hidapi_rumble.h in Headers */,
A75FCD3623E25AB700529352 /* SDL_sysaudio.h in Headers */,
A75FCD3723E25AB700529352 /* SDL_haptic.h in Headers */,
A75FDAC523E28BD800529352 /* SDL_sysjoystick_c.h in Headers */,
@@ -5938,6 +5961,7 @@
A75FCEED23E25AC700529352 /* blank_cursor.h in Headers */,
A75FDB6023E39E6100529352 /* hidapi.h in Headers */,
A75FCEEE23E25AC700529352 /* SDL_gesture.h in Headers */,
+ A75FDBCD23EA380300529352 /* SDL_hidapi_rumble.h in Headers */,
A75FCEEF23E25AC700529352 /* SDL_sysaudio.h in Headers */,
A75FCEF023E25AC700529352 /* SDL_haptic.h in Headers */,
A75FDAC723E28BD900529352 /* SDL_sysjoystick_c.h in Headers */,
@@ -6201,6 +6225,7 @@
A769B0BA23E259AE00872273 /* blank_cursor.h in Headers */,
A75FDB5D23E39E6100529352 /* hidapi.h in Headers */,
A769B0BB23E259AE00872273 /* SDL_gesture.h in Headers */,
+ A75FDBCA23EA380300529352 /* SDL_hidapi_rumble.h in Headers */,
A769B0BC23E259AE00872273 /* SDL_sysaudio.h in Headers */,
A769B0BD23E259AE00872273 /* SDL_haptic.h in Headers */,
A769B0BE23E259AE00872273 /* SDL_sysevents.h in Headers */,
@@ -6517,6 +6542,7 @@
A7D8B58823E2514300DCD162 /* SDL_joystick_c.h in Headers */,
A7D88A3C23E2437C00DCD162 /* SDL_name.h in Headers */,
A7D8A97023E2514000DCD162 /* SDL_coremotionsensor.h in Headers */,
+ A75FDBC623EA380300529352 /* SDL_hidapi_rumble.h in Headers */,
A7D8B98D23E2514400DCD162 /* SDL_shaders_metal_ios.h in Headers */,
A7D8AF1323E2514100DCD162 /* SDL_cocoaevents.h in Headers */,
A7D8BA7423E2514400DCD162 /* SDL_shaders_gl.h in Headers */,
@@ -6759,6 +6785,7 @@
A7D8AC5F23E2514100DCD162 /* SDL_uikitmetalview.h in Headers */,
A7D8B58923E2514300DCD162 /* SDL_joystick_c.h in Headers */,
A7D88BF523E24BED00DCD162 /* SDL_name.h in Headers */,
+ A75FDBC723EA380300529352 /* SDL_hidapi_rumble.h in Headers */,
A7D8A97123E2514000DCD162 /* SDL_coremotionsensor.h in Headers */,
A7D8B98E23E2514400DCD162 /* SDL_shaders_metal_ios.h in Headers */,
A7D8AF1423E2514100DCD162 /* SDL_cocoaevents.h in Headers */,
@@ -6924,6 +6951,7 @@
A7D8BB4923E2514500DCD162 /* blank_cursor.h in Headers */,
A75FDB5C23E39E6100529352 /* hidapi.h in Headers */,
A7D88D2C23E24D3B00DCD162 /* SDL_gesture.h in Headers */,
+ A75FDBC923EA380300529352 /* SDL_hidapi_rumble.h in Headers */,
A7D8B85E23E2514400DCD162 /* SDL_sysaudio.h in Headers */,
A7D88D2D23E24D3B00DCD162 /* SDL_haptic.h in Headers */,
A7D8BB9723E2514500DCD162 /* SDL_sysevents.h in Headers */,
@@ -7323,6 +7351,7 @@
AA7558501595D4D800BBD41B /* SDL_syswm.h in Headers */,
AA7558521595D4D800BBD41B /* SDL_thread.h in Headers */,
AA7558541595D4D800BBD41B /* SDL_timer.h in Headers */,
+ A75FDBC523EA380300529352 /* SDL_hidapi_rumble.h in Headers */,
A7D8B21223E2514200DCD162 /* SDL_x11events.h in Headers */,
AA7558561595D4D800BBD41B /* SDL_touch.h in Headers */,
A7D8A96323E2514000DCD162 /* SDL_dummysensor.h in Headers */,
@@ -7573,6 +7602,7 @@
AA75585D1595D4D800BBD41B /* SDL_video.h in Headers */,
AAC070FD195606770073DCDF /* SDL_opengles2_gl2.h in Headers */,
F3950CD9212BC88D00F51292 /* SDL_sensor.h in Headers */,
+ A75FDBC823EA380300529352 /* SDL_hidapi_rumble.h in Headers */,
A7D8AC4223E2514100DCD162 /* SDL_sysvideo.h in Headers */,
AAC07103195606770073DCDF /* SDL_opengles2_gl2platform.h in Headers */,
AAC07100195606770073DCDF /* SDL_opengles2_gl2ext.h in Headers */,
@@ -7811,6 +7841,7 @@
DB313FF817554B71006C0E22 /* SDL_video.h in Headers */,
AAC070FE195606770073DCDF /* SDL_opengles2_gl2.h in Headers */,
F3950CDA212BC88D00F51292 /* SDL_sensor.h in Headers */,
+ A75FDBCB23EA380300529352 /* SDL_hidapi_rumble.h in Headers */,
A7D8AC4423E2514100DCD162 /* SDL_sysvideo.h in Headers */,
AAC07104195606770073DCDF /* SDL_opengles2_gl2platform.h in Headers */,
AAC07101195606770073DCDF /* SDL_opengles2_gl2ext.h in Headers */,
@@ -8257,6 +8288,7 @@
A75FCDED23E25AB700529352 /* SDL_systls.c in Sources */,
A75FCDEE23E25AB700529352 /* SDL_vulkan_utils.c in Sources */,
A75FCDEF23E25AB700529352 /* SDL_spinlock.c in Sources */,
+ A75FDBD523EA380300529352 /* SDL_hidapi_rumble.c in Sources */,
A75FCDF023E25AB700529352 /* s_atan.c in Sources */,
A75FCDF123E25AB700529352 /* SDL_sysloadso.c in Sources */,
A75FCDF223E25AB700529352 /* SDL_render_metal.m in Sources */,
@@ -8451,6 +8483,7 @@
A75FCFA623E25AC700529352 /* SDL_systls.c in Sources */,
A75FCFA723E25AC700529352 /* SDL_vulkan_utils.c in Sources */,
A75FCFA823E25AC700529352 /* SDL_spinlock.c in Sources */,
+ A75FDBD623EA380300529352 /* SDL_hidapi_rumble.c in Sources */,
A75FCFA923E25AC700529352 /* s_atan.c in Sources */,
A75FCFAA23E25AC700529352 /* SDL_sysloadso.c in Sources */,
A75FCFAB23E25AC700529352 /* SDL_render_metal.m in Sources */,
@@ -8817,6 +8850,7 @@
A769B20A23E259AE00872273 /* SDL_malloc.c in Sources */,
A769B20B23E259AE00872273 /* SDL_audio.c in Sources */,
A769B20C23E259AE00872273 /* SDL_sysfilesystem.c in Sources */,
+ A75FDBD323EA380300529352 /* SDL_hidapi_rumble.c in Sources */,
A769B20D23E259AE00872273 /* SDL_offscreenvideo.c in Sources */,
A769B20E23E259AE00872273 /* SDL_syscond.c in Sources */,
A769B20F23E259AE00872273 /* SDL_syshaptic.c in Sources */,
@@ -8969,6 +9003,7 @@
A7D8BB5823E2514500DCD162 /* SDL_events.c in Sources */,
A7D8ADE723E2514100DCD162 /* SDL_blit_0.c in Sources */,
A7D8BB0A23E2514500DCD162 /* k_tan.c in Sources */,
+ A75FDBCF23EA380300529352 /* SDL_hidapi_rumble.c in Sources */,
A7D8B15F23E2514200DCD162 /* SDL_x11vulkan.c in Sources */,
A7D8B8A923E2514400DCD162 /* SDL_diskaudio.c in Sources */,
A7D8AFC123E2514200DCD162 /* SDL_egl.c in Sources */,
@@ -9162,6 +9197,7 @@
A7D8ADE823E2514100DCD162 /* SDL_blit_0.c in Sources */,
A7D8BB0B23E2514500DCD162 /* k_tan.c in Sources */,
A7D8B16023E2514200DCD162 /* SDL_x11vulkan.c in Sources */,
+ A75FDBD023EA380300529352 /* SDL_hidapi_rumble.c in Sources */,
A7D8B8AA23E2514400DCD162 /* SDL_diskaudio.c in Sources */,
A7D8B4E423E2514300DCD162 /* SDL_sysjoystick.m in Sources */,
A7D8AFC223E2514200DCD162 /* SDL_egl.c in Sources */,
@@ -9398,6 +9434,7 @@
A7D8B97823E2514400DCD162 /* SDL_malloc.c in Sources */,
A7D8B8CA23E2514400DCD162 /* SDL_audio.c in Sources */,
A7D8B62123E2514300DCD162 /* SDL_sysfilesystem.c in Sources */,
+ A75FDBD223EA380300529352 /* SDL_hidapi_rumble.c in Sources */,
A7D8AB8F23E2514100DCD162 /* SDL_offscreenvideo.c in Sources */,
A7D8B43223E2514300DCD162 /* SDL_syscond.c in Sources */,
A7D8AADE23E2514100DCD162 /* SDL_syshaptic.c in Sources */,
@@ -9463,6 +9500,7 @@
A7D8B3F223E2514300DCD162 /* SDL_thread.c in Sources */,
A7D8B55D23E2514300DCD162 /* SDL_hidapi_xbox360w.c in Sources */,
A7D8A95723E2514000DCD162 /* SDL_atomic.c in Sources */,
+ A75FDBCE23EA380300529352 /* SDL_hidapi_rumble.c in Sources */,
A7D8BB2723E2514500DCD162 /* SDL_displayevents.c in Sources */,
A7D8AF1823E2514100DCD162 /* SDL_cocoamousetap.m in Sources */,
A7D8AB2523E2514100DCD162 /* SDL_log.c in Sources */,
@@ -9652,6 +9690,7 @@
A7D8B3F523E2514300DCD162 /* SDL_thread.c in Sources */,
A7D8B56023E2514300DCD162 /* SDL_hidapi_xbox360w.c in Sources */,
A7D8A95A23E2514000DCD162 /* SDL_atomic.c in Sources */,
+ A75FDBD123EA380300529352 /* SDL_hidapi_rumble.c in Sources */,
A7D8BB2A23E2514500DCD162 /* SDL_displayevents.c in Sources */,
A7D8BBFC23E2574800DCD162 /* SDL_uikitopenglview.m in Sources */,
A7D8AF1B23E2514100DCD162 /* SDL_cocoamousetap.m in Sources */,
@@ -9844,6 +9883,7 @@
A7D8B3F723E2514300DCD162 /* SDL_thread.c in Sources */,
A7D8B56223E2514300DCD162 /* SDL_hidapi_xbox360w.c in Sources */,
A7D8A95C23E2514000DCD162 /* SDL_atomic.c in Sources */,
+ A75FDBD423EA380300529352 /* SDL_hidapi_rumble.c in Sources */,
A7D8BB2C23E2514500DCD162 /* SDL_displayevents.c in Sources */,
A7D8AF1D23E2514100DCD162 /* SDL_cocoamousetap.m in Sources */,
A7D8AB2A23E2514100DCD162 /* SDL_log.c in Sources */,
diff --git a/src/joystick/hidapi/SDL_hidapi_rumble.c b/src/joystick/hidapi/SDL_hidapi_rumble.c
index c15f1c1..b2fe788 100644
--- a/src/joystick/hidapi/SDL_hidapi_rumble.c
+++ b/src/joystick/hidapi/SDL_hidapi_rumble.c
@@ -141,7 +141,7 @@ int SDL_HIDAPI_SendRumble(SDL_HIDAPI_Device *device, const Uint8 *data, int size
SDL_HIDAPI_RumbleRequest *request;
if (size > sizeof(request->data)) {
- return SDL_SetError("Couldn't send rumble, size %d is greater than %d", size, sizeof(request->data));
+ return SDL_SetError("Couldn't send rumble, size %d is greater than %d", size, (int)sizeof(request->data));
}
if (!ctx->running) {
@@ -174,7 +174,7 @@ int SDL_HIDAPI_SendRumble(SDL_HIDAPI_Device *device, const Uint8 *data, int size
return size;
}
-void SDL_HIDAPI_QuitRumble()
+void SDL_HIDAPI_QuitRumble(void)
{
SDL_HIDAPI_RumbleContext *ctx = &rumble_context;
diff --git a/src/joystick/hidapi/SDL_hidapi_rumble.h b/src/joystick/hidapi/SDL_hidapi_rumble.h
index 1ce67ba..dde3dbd 100644
--- a/src/joystick/hidapi/SDL_hidapi_rumble.h
+++ b/src/joystick/hidapi/SDL_hidapi_rumble.h
@@ -24,7 +24,7 @@
/* Handle rumble on a separate thread so it doesn't block the application */
int SDL_HIDAPI_SendRumble(SDL_HIDAPI_Device *device, const Uint8 *data, int size);
-void SDL_HIDAPI_QuitRumble();
+void SDL_HIDAPI_QuitRumble(void);
#endif /* SDL_JOYSTICK_HIDAPI */