Build hidapi as a framework on iOS, so it can be linked by the application as well.
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 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727
diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
index a0e1a9c..6cf3027 100755
--- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj
+++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
@@ -856,10 +856,6 @@
A75FD05A23E25AC700529352 /* SDL_cocoavulkan.m in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A68323E2513E00DCD162 /* SDL_cocoavulkan.m */; };
A75FD05B23E25AC700529352 /* SDL_uikitappdelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A61E23E2513D00DCD162 /* SDL_uikitappdelegate.m */; };
A75FD05C23E25AC700529352 /* SDL_offscreenwindow.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A5EF23E2513D00DCD162 /* SDL_offscreenwindow.c */; };
- A75FDAA623E2792500529352 /* hid.m in Sources */ = {isa = PBXBuildFile; fileRef = A75FDAA523E2792500529352 /* hid.m */; };
- A75FDAA723E2792500529352 /* hid.m in Sources */ = {isa = PBXBuildFile; fileRef = A75FDAA523E2792500529352 /* hid.m */; };
- A75FDAA823E2792500529352 /* hid.m in Sources */ = {isa = PBXBuildFile; fileRef = A75FDAA523E2792500529352 /* hid.m */; };
- A75FDAA923E2792500529352 /* hid.m in Sources */ = {isa = PBXBuildFile; fileRef = A75FDAA523E2792500529352 /* hid.m */; };
A75FDAAA23E2792500529352 /* hid.m in Sources */ = {isa = PBXBuildFile; fileRef = A75FDAA523E2792500529352 /* hid.m */; };
A75FDAAB23E2792500529352 /* hid.m in Sources */ = {isa = PBXBuildFile; fileRef = A75FDAA523E2792500529352 /* hid.m */; };
A75FDAAD23E2795C00529352 /* SDL_hidapi_steam.c in Sources */ = {isa = PBXBuildFile; fileRef = A75FDAAC23E2795C00529352 /* SDL_hidapi_steam.c */; };
@@ -899,6 +895,27 @@
A75FDAF923E35ED500529352 /* SDL_config_iphoneos.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDAF523E35EC400529352 /* SDL_config_iphoneos.h */; };
A75FDAFA23E35ED600529352 /* SDL_config_iphoneos.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDAF523E35EC400529352 /* SDL_config_iphoneos.h */; };
A75FDAFB23E35ED700529352 /* SDL_config_iphoneos.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDAF523E35EC400529352 /* SDL_config_iphoneos.h */; };
+ A75FDB5123E39D1700529352 /* hid.m in Sources */ = {isa = PBXBuildFile; fileRef = A75FDAA523E2792500529352 /* hid.m */; };
+ A75FDB5223E39D1700529352 /* hid.m in Sources */ = {isa = PBXBuildFile; fileRef = A75FDAA523E2792500529352 /* hid.m */; };
+ A75FDB5323E39D1C00529352 /* hid.m in Sources */ = {isa = PBXBuildFile; fileRef = A75FDAA523E2792500529352 /* hid.m */; };
+ A75FDB5423E39D7200529352 /* hidapi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A75FDB4923E399AC00529352 /* hidapi.framework */; };
+ A75FDB5523E39DAC00529352 /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A75FDAC323E28BA700529352 /* CoreBluetooth.framework */; };
+ A75FDB5623E39DE900529352 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7D88BBB23E24A2F00DCD162 /* UIKit.framework */; };
+ A75FDB5823E39E6100529352 /* hidapi.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDB5723E39E6100529352 /* hidapi.h */; };
+ A75FDB5923E39E6100529352 /* hidapi.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDB5723E39E6100529352 /* hidapi.h */; };
+ A75FDB5A23E39E6100529352 /* hidapi.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDB5723E39E6100529352 /* hidapi.h */; };
+ A75FDB5B23E39E6100529352 /* hidapi.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDB5723E39E6100529352 /* hidapi.h */; };
+ A75FDB5C23E39E6100529352 /* hidapi.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDB5723E39E6100529352 /* hidapi.h */; };
+ A75FDB5D23E39E6100529352 /* hidapi.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDB5723E39E6100529352 /* hidapi.h */; };
+ A75FDB5E23E39E6100529352 /* hidapi.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDB5723E39E6100529352 /* hidapi.h */; };
+ A75FDB5F23E39E6100529352 /* hidapi.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDB5723E39E6100529352 /* hidapi.h */; };
+ A75FDB6023E39E6100529352 /* hidapi.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDB5723E39E6100529352 /* hidapi.h */; };
+ A75FDB6123E39E6100529352 /* hidapi.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDB5723E39E6100529352 /* hidapi.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ A75FDB6423E3A2C900529352 /* hidapi.h in Headers */ = {isa = PBXBuildFile; fileRef = A75FDB5723E39E6100529352 /* hidapi.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ A75FDB6623E3A2C900529352 /* hid.m in Sources */ = {isa = PBXBuildFile; fileRef = A75FDAA523E2792500529352 /* hid.m */; };
+ A75FDB6823E3A2C900529352 /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A75FDAC323E28BA700529352 /* CoreBluetooth.framework */; };
+ A75FDB6923E3A2C900529352 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7D88BBB23E24A2F00DCD162 /* UIKit.framework */; };
+ A75FDB7023E3A34200529352 /* hidapi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A75FDB6E23E3A2C900529352 /* hidapi.framework */; };
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, ); }; };
@@ -3892,6 +3909,10 @@
A75FDADC23E28D5500529352 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS13.2.sdk/System/Library/Frameworks/AVFoundation.framework; sourceTree = DEVELOPER_DIR; };
A75FDADE23E28D6600529352 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS13.2.sdk/System/Library/Frameworks/AudioToolbox.framework; sourceTree = DEVELOPER_DIR; };
A75FDAF523E35EC400529352 /* SDL_config_iphoneos.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_config_iphoneos.h; sourceTree = "<group>"; };
+ A75FDB4923E399AC00529352 /* hidapi.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = hidapi.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ A75FDB4C23E399AC00529352 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+ A75FDB5723E39E6100529352 /* hidapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hidapi.h; path = hidapi/hidapi.h; sourceTree = "<group>"; };
+ A75FDB6E23E3A2C900529352 /* hidapi.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = hidapi.framework; sourceTree = BUILT_PRODUCTS_DIR; };
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; };
@@ -3904,11 +3925,11 @@
A7D88BC723E24B0200DCD162 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.2.sdk/System/Library/Frameworks/CoreGraphics.framework; sourceTree = DEVELOPER_DIR; };
A7D88D1523E24BED00DCD162 /* SDL2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDL2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
A7D88E5423E24D3B00DCD162 /* libSDL2.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSDL2.a; sourceTree = BUILT_PRODUCTS_DIR; };
- A7D8A57023E2513D00DCD162 /* SDL_dataqueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_dataqueue.h; path = ../../src/SDL_dataqueue.h; sourceTree = "<group>"; };
- A7D8A57123E2513D00DCD162 /* SDL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL.c; path = ../../src/SDL.c; sourceTree = "<group>"; };
+ A7D8A57023E2513D00DCD162 /* SDL_dataqueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_dataqueue.h; sourceTree = "<group>"; };
+ A7D8A57123E2513D00DCD162 /* SDL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL.c; sourceTree = "<group>"; };
A7D8A57323E2513D00DCD162 /* SDL_spinlock.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_spinlock.c; sourceTree = "<group>"; };
A7D8A57423E2513D00DCD162 /* SDL_atomic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_atomic.c; sourceTree = "<group>"; };
- A7D8A57523E2513D00DCD162 /* SDL_error_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_error_c.h; path = ../../src/SDL_error_c.h; sourceTree = "<group>"; };
+ A7D8A57523E2513D00DCD162 /* SDL_error_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_error_c.h; sourceTree = "<group>"; };
A7D8A57823E2513D00DCD162 /* SDL_dummysensor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_dummysensor.h; sourceTree = "<group>"; };
A7D8A57923E2513D00DCD162 /* SDL_dummysensor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_dummysensor.c; sourceTree = "<group>"; };
A7D8A57B23E2513D00DCD162 /* SDL_coremotionsensor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_coremotionsensor.h; sourceTree = "<group>"; };
@@ -3916,8 +3937,8 @@
A7D8A57D23E2513D00DCD162 /* SDL_syssensor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_syssensor.h; sourceTree = "<group>"; };
A7D8A58123E2513D00DCD162 /* SDL_sensor_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sensor_c.h; sourceTree = "<group>"; };
A7D8A58223E2513D00DCD162 /* SDL_sensor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_sensor.c; sourceTree = "<group>"; };
- A7D8A58323E2513D00DCD162 /* SDL_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_internal.h; path = ../../src/SDL_internal.h; sourceTree = "<group>"; };
- A7D8A5AB23E2513D00DCD162 /* SDL_hints.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_hints.c; path = ../../src/SDL_hints.c; sourceTree = "<group>"; };
+ A7D8A58323E2513D00DCD162 /* SDL_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_internal.h; sourceTree = "<group>"; };
+ A7D8A5AB23E2513D00DCD162 /* SDL_hints.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_hints.c; sourceTree = "<group>"; };
A7D8A5B023E2513D00DCD162 /* SDL_uikit_main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_uikit_main.c; sourceTree = "<group>"; };
A7D8A5C423E2513D00DCD162 /* SDL_syshaptic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_syshaptic.c; sourceTree = "<group>"; };
A7D8A5C523E2513D00DCD162 /* SDL_haptic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_haptic.c; sourceTree = "<group>"; };
@@ -3929,7 +3950,7 @@
A7D8A5D923E2513D00DCD162 /* SDL_dynapi_overrides.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_dynapi_overrides.h; sourceTree = "<group>"; };
A7D8A5DA23E2513D00DCD162 /* SDL_dynapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_dynapi.c; sourceTree = "<group>"; };
A7D8A5DB23E2513D00DCD162 /* SDL_dynapi_procs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_dynapi_procs.h; sourceTree = "<group>"; };
- A7D8A5DD23E2513D00DCD162 /* SDL_log.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_log.c; path = ../../src/SDL_log.c; sourceTree = "<group>"; };
+ A7D8A5DD23E2513D00DCD162 /* SDL_log.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_log.c; sourceTree = "<group>"; };
A7D8A5DF23E2513D00DCD162 /* SDL_timer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_timer.c; sourceTree = "<group>"; };
A7D8A5E023E2513D00DCD162 /* SDL_timer_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_timer_c.h; sourceTree = "<group>"; };
A7D8A5E223E2513D00DCD162 /* SDL_systimer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_systimer.c; sourceTree = "<group>"; };
@@ -4145,7 +4166,7 @@
A7D8A7E723E2513F00DCD162 /* SDL_power.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_power.c; sourceTree = "<group>"; };
A7D8A7EB23E2513F00DCD162 /* SDL_syspower.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_syspower.c; sourceTree = "<group>"; };
A7D8A7F423E2513F00DCD162 /* SDL_syspower.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_syspower.h; sourceTree = "<group>"; };
- A7D8A7F523E2513F00DCD162 /* SDL_assert_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_assert_c.h; path = ../../src/SDL_assert_c.h; sourceTree = "<group>"; };
+ A7D8A7F523E2513F00DCD162 /* SDL_assert_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_assert_c.h; sourceTree = "<group>"; };
A7D8A7F823E2513F00DCD162 /* SDL_sysfilesystem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_sysfilesystem.c; sourceTree = "<group>"; };
A7D8A7FE23E2513F00DCD162 /* SDL_sysfilesystem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_sysfilesystem.m; sourceTree = "<group>"; };
A7D8A81423E2513F00DCD162 /* SDL_hidapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_hidapi.c; sourceTree = "<group>"; };
@@ -4167,8 +4188,8 @@
A7D8A8B823E2513F00DCD162 /* SDL_audio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audio.c; sourceTree = "<group>"; };
A7D8A8BA23E2513F00DCD162 /* SDL_coreaudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_coreaudio.h; sourceTree = "<group>"; };
A7D8A8BB23E2513F00DCD162 /* SDL_coreaudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_coreaudio.m; sourceTree = "<group>"; };
- A7D8A8BF23E2513F00DCD162 /* SDL_error.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_error.c; path = ../../src/SDL_error.c; sourceTree = "<group>"; };
- A7D8A8D123E2514000DCD162 /* SDL_hints_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_hints_c.h; path = ../../src/SDL_hints_c.h; sourceTree = "<group>"; };
+ A7D8A8BF23E2513F00DCD162 /* SDL_error.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_error.c; sourceTree = "<group>"; };
+ A7D8A8D123E2514000DCD162 /* SDL_hints_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_hints_c.h; sourceTree = "<group>"; };
A7D8A8D323E2514000DCD162 /* SDL_iconv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_iconv.c; sourceTree = "<group>"; };
A7D8A8D423E2514000DCD162 /* SDL_getenv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_getenv.c; sourceTree = "<group>"; };
A7D8A8D523E2514000DCD162 /* SDL_string.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_string.c; sourceTree = "<group>"; };
@@ -4234,7 +4255,7 @@
A7D8A92523E2514000DCD162 /* s_floor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = s_floor.c; sourceTree = "<group>"; };
A7D8A92623E2514000DCD162 /* math_libm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = math_libm.h; sourceTree = "<group>"; };
A7D8A92723E2514000DCD162 /* k_tan.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = k_tan.c; sourceTree = "<group>"; };
- A7D8A92823E2514000DCD162 /* SDL_dataqueue.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_dataqueue.c; path = ../../src/SDL_dataqueue.c; sourceTree = "<group>"; };
+ A7D8A92823E2514000DCD162 /* SDL_dataqueue.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_dataqueue.c; sourceTree = "<group>"; };
A7D8A92A23E2514000DCD162 /* SDL_mouse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_mouse.c; sourceTree = "<group>"; };
A7D8A92B23E2514000DCD162 /* SDL_mouse_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_mouse_c.h; sourceTree = "<group>"; };
A7D8A92C23E2514000DCD162 /* scancodes_windows.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scancodes_windows.h; sourceTree = "<group>"; };
@@ -4261,7 +4282,7 @@
A7D8A94123E2514000DCD162 /* scancodes_xfree86.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scancodes_xfree86.h; sourceTree = "<group>"; };
A7D8A94223E2514000DCD162 /* SDL_events_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_events_c.h; sourceTree = "<group>"; };
A7D8A94323E2514000DCD162 /* SDL_windowevents_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_windowevents_c.h; sourceTree = "<group>"; };
- A7D8A94423E2514000DCD162 /* SDL_assert.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_assert.c; path = ../../src/SDL_assert.c; sourceTree = "<group>"; };
+ A7D8A94423E2514000DCD162 /* SDL_assert.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_assert.c; sourceTree = "<group>"; };
AA7557C71595D4D800BBD41B /* begin_code.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = begin_code.h; sourceTree = "<group>"; };
AA7557C81595D4D800BBD41B /* close_code.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = close_code.h; sourceTree = "<group>"; };
AA7557C91595D4D800BBD41B /* SDL_assert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_assert.h; sourceTree = "<group>"; };
@@ -4373,6 +4394,24 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ A75FDB4623E399AC00529352 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ A75FDB5523E39DAC00529352 /* CoreBluetooth.framework in Frameworks */,
+ A75FDB5623E39DE900529352 /* UIKit.framework in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ A75FDB6723E3A2C900529352 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ A75FDB6823E3A2C900529352 /* CoreBluetooth.framework in Frameworks */,
+ A75FDB6923E3A2C900529352 /* UIKit.framework in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
A769B22E23E259AE00872273 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -4398,6 +4437,7 @@
A7D88BC023E24A7700DCD162 /* OpenGLES.framework in Frameworks */,
A7D88B4823E2437C00DCD162 /* QuartzCore.framework in Frameworks */,
A7D88BBC23E24A2F00DCD162 /* UIKit.framework in Frameworks */,
+ A75FDB5423E39D7200529352 /* hidapi.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -4417,6 +4457,7 @@
A7D88D0F23E24BED00DCD162 /* OpenGLES.framework in Frameworks */,
A7D88D1023E24BED00DCD162 /* QuartzCore.framework in Frameworks */,
A7D88D1123E24BED00DCD162 /* UIKit.framework in Frameworks */,
+ A75FDB7023E3A34200529352 /* hidapi.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -4556,6 +4597,8 @@
A769B23D23E259AE00872273 /* libSDL2.a */,
A75FCEB323E25AB700529352 /* libSDL2.dylib */,
A75FD06C23E25AC700529352 /* libSDL2.dylib */,
+ A75FDB4923E399AC00529352 /* hidapi.framework */,
+ A75FDB6E23E3A2C900529352 /* hidapi.framework */,
);
name = Products;
sourceTree = "<group>";
@@ -4567,17 +4610,7 @@
F59C70FC00D5CB5801000001 /* pkg-support */,
0153844A006D81B07F000001 /* Public Headers */,
08FB77ACFE841707C02AAC07 /* Library Source */,
- A7D8A57123E2513D00DCD162 /* SDL.c */,
- A7D8A7F523E2513F00DCD162 /* SDL_assert_c.h */,
- A7D8A94423E2514000DCD162 /* SDL_assert.c */,
- A7D8A92823E2514000DCD162 /* SDL_dataqueue.c */,
- A7D8A57023E2513D00DCD162 /* SDL_dataqueue.h */,
- A7D8A57523E2513D00DCD162 /* SDL_error_c.h */,
- A7D8A8BF23E2513F00DCD162 /* SDL_error.c */,
- A7D8A8D123E2514000DCD162 /* SDL_hints_c.h */,
- A7D8A5AB23E2513D00DCD162 /* SDL_hints.c */,
- A7D8A58323E2513D00DCD162 /* SDL_internal.h */,
- A7D8A5DD23E2513D00DCD162 /* SDL_log.c */,
+ A75FDB4A23E399AC00529352 /* hidapi */,
034768DDFF38A45A11DB9C8B /* Products */,
BECDF66B0761BA81005FE872 /* Info-Framework.plist */,
564624341FF821B70074AC87 /* Frameworks */,
@@ -4612,6 +4645,17 @@
A7D8A77623E2513E00DCD162 /* thread */,
A7D8A5DE23E2513D00DCD162 /* timer */,
A7D8A5EB23E2513D00DCD162 /* video */,
+ A7D8A7F523E2513F00DCD162 /* SDL_assert_c.h */,
+ A7D8A94423E2514000DCD162 /* SDL_assert.c */,
+ A7D8A92823E2514000DCD162 /* SDL_dataqueue.c */,
+ A7D8A57023E2513D00DCD162 /* SDL_dataqueue.h */,
+ A7D8A57523E2513D00DCD162 /* SDL_error_c.h */,
+ A7D8A8BF23E2513F00DCD162 /* SDL_error.c */,
+ A7D8A8D123E2514000DCD162 /* SDL_hints_c.h */,
+ A7D8A5AB23E2513D00DCD162 /* SDL_hints.c */,
+ A7D8A58323E2513D00DCD162 /* SDL_internal.h */,
+ A7D8A5DD23E2513D00DCD162 /* SDL_log.c */,
+ A7D8A57123E2513D00DCD162 /* SDL.c */,
);
name = "Library Source";
path = ../../src;
@@ -4667,6 +4711,14 @@
path = ios;
sourceTree = "<group>";
};
+ A75FDB4A23E399AC00529352 /* hidapi */ = {
+ isa = PBXGroup;
+ children = (
+ A75FDB4C23E399AC00529352 /* Info.plist */,
+ );
+ path = hidapi;
+ sourceTree = "<group>";
+ };
A7D8A57223E2513D00DCD162 /* atomic */ = {
isa = PBXGroup;
children = (
@@ -5231,6 +5283,7 @@
A7D8A80923E2513F00DCD162 /* hidapi */ = {
isa = PBXGroup;
children = (
+ A75FDB5723E39E6100529352 /* hidapi.h */,
A75FDAA423E2790500529352 /* ios */,
A7D8A81423E2513F00DCD162 /* SDL_hidapi.c */,
);
@@ -5546,6 +5599,7 @@
A75FCD3223E25AB700529352 /* SDL_joystick_c.h in Headers */,
A75FCD3323E25AB700529352 /* vk_sdk_platform.h in Headers */,
A75FCD3423E25AB700529352 /* blank_cursor.h in Headers */,
+ A75FDB5F23E39E6100529352 /* hidapi.h in Headers */,
A75FCD3523E25AB700529352 /* SDL_gesture.h in Headers */,
A75FCD3623E25AB700529352 /* SDL_sysaudio.h in Headers */,
A75FCD3723E25AB700529352 /* SDL_haptic.h in Headers */,
@@ -5784,6 +5838,7 @@
A75FCEEB23E25AC700529352 /* SDL_joystick_c.h in Headers */,
A75FCEEC23E25AC700529352 /* vk_sdk_platform.h in Headers */,
A75FCEED23E25AC700529352 /* blank_cursor.h in Headers */,
+ A75FDB6023E39E6100529352 /* hidapi.h in Headers */,
A75FCEEE23E25AC700529352 /* SDL_gesture.h in Headers */,
A75FCEEF23E25AC700529352 /* SDL_sysaudio.h in Headers */,
A75FCEF023E25AC700529352 /* SDL_haptic.h in Headers */,
@@ -5965,6 +6020,22 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ A75FDB4423E399AC00529352 /* Headers */ = {
+ isa = PBXHeadersBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ A75FDB6123E39E6100529352 /* hidapi.h in Headers */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ A75FDB6323E3A2C900529352 /* Headers */ = {
+ isa = PBXHeadersBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ A75FDB6423E3A2C900529352 /* hidapi.h in Headers */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
A769B08323E259AE00872273 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
@@ -6022,6 +6093,7 @@
A769B0B823E259AE00872273 /* SDL_joystick_c.h in Headers */,
A769B0B923E259AE00872273 /* vk_sdk_platform.h in Headers */,
A769B0BA23E259AE00872273 /* blank_cursor.h in Headers */,
+ A75FDB5D23E39E6100529352 /* hidapi.h in Headers */,
A769B0BB23E259AE00872273 /* SDL_gesture.h in Headers */,
A769B0BC23E259AE00872273 /* SDL_sysaudio.h in Headers */,
A769B0BD23E259AE00872273 /* SDL_haptic.h in Headers */,
@@ -6209,6 +6281,7 @@
files = (
A75FDAF623E35EC400529352 /* SDL_config_iphoneos.h in Headers */,
A7D88A1623E2437C00DCD162 /* begin_code.h in Headers */,
+ A75FDB5923E39E6100529352 /* hidapi.h in Headers */,
A7D8B24323E2514200DCD162 /* eglext.h in Headers */,
A7D8AABD23E2514100DCD162 /* SDL_haptic_c.h in Headers */,
A7D88A1823E2437C00DCD162 /* close_code.h in Headers */,
@@ -6450,6 +6523,7 @@
files = (
A75FDAF723E35EC400529352 /* SDL_config_iphoneos.h in Headers */,
A7D88BCC23E24BED00DCD162 /* begin_code.h in Headers */,
+ A75FDB5A23E39E6100529352 /* hidapi.h in Headers */,
A7D8B24423E2514200DCD162 /* eglext.h in Headers */,
A7D8AABE23E2514100DCD162 /* SDL_haptic_c.h in Headers */,
A7D88BCE23E24BED00DCD162 /* close_code.h in Headers */,
@@ -6742,6 +6816,7 @@
A7D8B58B23E2514300DCD162 /* SDL_joystick_c.h in Headers */,
A7D8B2B223E2514200DCD162 /* vk_sdk_platform.h in Headers */,
A7D8BB4923E2514500DCD162 /* blank_cursor.h in Headers */,
+ A75FDB5C23E39E6100529352 /* hidapi.h in Headers */,
A7D88D2C23E24D3B00DCD162 /* SDL_gesture.h in Headers */,
A7D8B85E23E2514400DCD162 /* SDL_sysaudio.h in Headers */,
A7D88D2D23E24D3B00DCD162 /* SDL_haptic.h in Headers */,
@@ -6928,6 +7003,7 @@
buildActionMask = 2147483647;
files = (
AA7557FA1595D4D800BBD41B /* begin_code.h in Headers */,
+ A75FDB5823E39E6100529352 /* hidapi.h in Headers */,
A7D8B24223E2514200DCD162 /* eglext.h in Headers */,
A7D8AABC23E2514100DCD162 /* SDL_haptic_c.h in Headers */,
AA7557FC1595D4D800BBD41B /* close_code.h in Headers */,
@@ -7213,6 +7289,7 @@
A7D8B2C323E2514200DCD162 /* SDL_pixels_c.h in Headers */,
A7D8B1BB23E2514200DCD162 /* SDL_x11modes.h in Headers */,
A7D8B58A23E2514300DCD162 /* SDL_joystick_c.h in Headers */,
+ A75FDB5B23E39E6100529352 /* hidapi.h in Headers */,
A7D8B2B123E2514200DCD162 /* vk_sdk_platform.h in Headers */,
A7D8BB4823E2514500DCD162 /* blank_cursor.h in Headers */,
AA7558171595D4D800BBD41B /* SDL_gesture.h in Headers */,
@@ -7450,6 +7527,7 @@
DB313FD317554B71006C0E22 /* SDL_endian.h in Headers */,
DB313FD417554B71006C0E22 /* SDL_error.h in Headers */,
DB313FD517554B71006C0E22 /* SDL_events.h in Headers */,
+ A75FDB5E23E39E6100529352 /* hidapi.h in Headers */,
A7D8BA0623E2514400DCD162 /* SDL_blendfillrect.h in Headers */,
DB313FFB17554B71006C0E22 /* SDL_gamecontroller.h in Headers */,
A7D8B55C23E2514300DCD162 /* SDL_hidapijoystick_c.h in Headers */,
@@ -7680,6 +7758,42 @@
productReference = A75FD06C23E25AC700529352 /* libSDL2.dylib */;
productType = "com.apple.product-type.library.dynamic";
};
+ A75FDB4823E399AC00529352 /* hidapi-iOS */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = A75FDB5023E399AC00529352 /* Build configuration list for PBXNativeTarget "hidapi-iOS" */;
+ buildPhases = (
+ A75FDB4423E399AC00529352 /* Headers */,
+ A75FDB4523E399AC00529352 /* Sources */,
+ A75FDB4623E399AC00529352 /* Frameworks */,
+ A75FDB4723E399AC00529352 /* Resources */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = "hidapi-iOS";
+ productName = hidapi;
+ productReference = A75FDB4923E399AC00529352 /* hidapi.framework */;
+ productType = "com.apple.product-type.framework";
+ };
+ A75FDB6223E3A2C900529352 /* hidapi-tvOS */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = A75FDB6B23E3A2C900529352 /* Build configuration list for PBXNativeTarget "hidapi-tvOS" */;
+ buildPhases = (
+ A75FDB6323E3A2C900529352 /* Headers */,
+ A75FDB6523E3A2C900529352 /* Sources */,
+ A75FDB6723E3A2C900529352 /* Frameworks */,
+ A75FDB6A23E3A2C900529352 /* Resources */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = "hidapi-tvOS";
+ productName = hidapi;
+ productReference = A75FDB6E23E3A2C900529352 /* hidapi.framework */;
+ productType = "com.apple.product-type.framework";
+ };
A769B08223E259AE00872273 /* Static Library-tvOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = A769B23A23E259AE00872273 /* Build configuration list for PBXNativeTarget "Static Library-tvOS" */;
@@ -7844,11 +7958,21 @@
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1130;
+ TargetAttributes = {
+ A75FDB4823E399AC00529352 = {
+ CreatedOnToolsVersion = 11.3.1;
+ };
+ };
};
buildConfigurationList = 0073178E0858DB0500B2BC32 /* Build configuration list for PBXProject "SDL" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
+ knownRegions = (
+ English,
+ en,
+ Base,
+ );
mainGroup = 0867D691FE84028FC02AAC07 /* SDLFramework */;
productRefGroup = 034768DDFF38A45A11DB9C8B /* Products */;
projectDirPath = "";
@@ -7864,11 +7988,27 @@
A75FCCFB23E25AB700529352 /* Shared Library-iOS */,
A75FCEB423E25AC700529352 /* Shared Library-tvOS */,
BECDF6BB0761BA81005FE872 /* Standard DMG */,
+ A75FDB4823E399AC00529352 /* hidapi-iOS */,
+ A75FDB6223E3A2C900529352 /* hidapi-tvOS */,
);
};
/* End PBXProject section */
/* Begin PBXResourcesBuildPhase section */
+ A75FDB4723E399AC00529352 /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ A75FDB6A23E3A2C900529352 /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
A7D88ABE23E2437C00DCD162 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
@@ -8338,6 +8478,22 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ A75FDB4523E399AC00529352 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ A75FDB5323E39D1C00529352 /* hid.m in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ A75FDB6523E3A2C900529352 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ A75FDB6623E3A2C900529352 /* hid.m in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
A769B17023E259AE00872273 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -8487,7 +8643,7 @@
A769B20123E259AE00872273 /* SDL_rect.c in Sources */,
A769B20223E259AE00872273 /* SDL_cocoaopengles.m in Sources */,
A769B20323E259AE00872273 /* SDL_qsort.c in Sources */,
- A75FDAA923E2792500529352 /* hid.m in Sources */,
+ A75FDB5223E39D1700529352 /* hid.m in Sources */,
A769B20423E259AE00872273 /* SDL_hidapi_switch.c in Sources */,
A769B20523E259AE00872273 /* SDL_strtokr.c in Sources */,
A769B20623E259AE00872273 /* SDL_clipboardevents.c in Sources */,
@@ -8614,7 +8770,6 @@
A7D8ACDC23E2514100DCD162 /* SDL_uikitvideo.m in Sources */,
A7D8AEE323E2514100DCD162 /* SDL_cocoashape.m in Sources */,
A7D8AEB923E2514100DCD162 /* SDL_cocoamouse.m in Sources */,
- A75FDAA623E2792500529352 /* hid.m in Sources */,
A7D8B8E523E2514400DCD162 /* SDL_error.c in Sources */,
A7D8AD6923E2514100DCD162 /* SDL_blit.c in Sources */,
A7D8B5BE23E2514300DCD162 /* SDL_rwops.c in Sources */,
@@ -8808,7 +8963,6 @@
A7D8AEE423E2514100DCD162 /* SDL_cocoashape.m in Sources */,
A7D8AEBA23E2514100DCD162 /* SDL_cocoamouse.m in Sources */,
A7D8B8E623E2514400DCD162 /* SDL_error.c in Sources */,
- A75FDAA723E2792500529352 /* hid.m in Sources */,
A7D8AD6A23E2514100DCD162 /* SDL_blit.c in Sources */,
A7D8B5BF23E2514300DCD162 /* SDL_rwops.c in Sources */,
A7D8ACD123E2514100DCD162 /* SDL_uikitviewcontroller.m in Sources */,
@@ -9070,7 +9224,7 @@
A7D8ACEB23E2514100DCD162 /* SDL_rect.c in Sources */,
A7D8AE9E23E2514100DCD162 /* SDL_cocoaopengles.m in Sources */,
A7D8B96C23E2514400DCD162 /* SDL_qsort.c in Sources */,
- A75FDAA823E2792500529352 /* hid.m in Sources */,
+ A75FDB5123E39D1700529352 /* hid.m in Sources */,
A7D8B55523E2514300DCD162 /* SDL_hidapi_switch.c in Sources */,
A7D8B96623E2514400DCD162 /* SDL_strtokr.c in Sources */,
A7D8BB7923E2514500DCD162 /* SDL_clipboardevents.c in Sources */,
@@ -9725,9 +9879,11 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEPLOYMENT_POSTPROCESSING = YES;
DYLIB_COMPATIBILITY_VERSION = 1.0.0;
DYLIB_CURRENT_VERSION = 12.0.0;
+ DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_ALTIVEC_EXTENSIONS = YES;
GCC_AUTO_VECTORIZATION = YES;
@@ -9750,6 +9906,7 @@
);
INFOPLIST_FILE = "Info-Framework.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.6;
PRODUCT_BUNDLE_IDENTIFIER = org.libsdl.SDL2;
PRODUCT_NAME = SDL2;
@@ -9762,9 +9919,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_LINK_OBJC_RUNTIME = NO;
- INSTALL_PATH = "@rpath";
OTHER_LDFLAGS = "-liconv";
- WRAPPER_EXTENSION = framework;
};
name = Release;
};
@@ -9805,8 +9960,10 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 1.0.0;
DYLIB_CURRENT_VERSION = 12.0.0;
+ DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_ALTIVEC_EXTENSIONS = YES;
@@ -9829,6 +9986,7 @@
);
INFOPLIST_FILE = "Info-Framework.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.6;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = org.libsdl.SDL2;
@@ -9842,9 +10000,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_LINK_OBJC_RUNTIME = NO;
- INSTALL_PATH = "@rpath";
OTHER_LDFLAGS = "-liconv";
- WRAPPER_EXTENSION = framework;
};
name = Debug;
};
@@ -9911,6 +10067,68 @@
};
name = Release;
};
+ A75FDB4E23E399AC00529352 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_ENABLE_OBJC_WEAK = YES;
+ DYLIB_COMPATIBILITY_VERSION = 1;
+ DYLIB_CURRENT_VERSION = 1;
+ GCC_PREPROCESSOR_DEFINITIONS = "HID_API_EXPORT=\"__attribute__ ((visibility(\\\"default\\\")))\"";
+ INFOPLIST_FILE = hidapi/Info.plist;
+ PRODUCT_BUNDLE_IDENTIFIER = org.libsdl.hidapi;
+ PRODUCT_NAME = hidapi;
+ SDKROOT = iphoneos;
+ TARGETED_DEVICE_FAMILY = "1,2";
+ };
+ name = Debug;
+ };
+ A75FDB4F23E399AC00529352 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_ENABLE_OBJC_WEAK = YES;
+ DYLIB_COMPATIBILITY_VERSION = 1;
+ DYLIB_CURRENT_VERSION = 1;
+ GCC_PREPROCESSOR_DEFINITIONS = "HID_API_EXPORT=\"__attribute__ ((visibility(\\\"default\\\")))\"";
+ INFOPLIST_FILE = hidapi/Info.plist;
+ PRODUCT_BUNDLE_IDENTIFIER = org.libsdl.hidapi;
+ PRODUCT_NAME = hidapi;
+ SDKROOT = iphoneos;
+ TARGETED_DEVICE_FAMILY = "1,2";
+ };
+ name = Release;
+ };
+ A75FDB6C23E3A2C900529352 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_ENABLE_OBJC_WEAK = YES;
+ DYLIB_COMPATIBILITY_VERSION = 1;
+ DYLIB_CURRENT_VERSION = 1;
+ GCC_PREPROCESSOR_DEFINITIONS = "HID_API_EXPORT=\"__attribute__ ((visibility(\\\"default\\\")))\"";
+ INFOPLIST_FILE = hidapi/Info.plist;
+ PRODUCT_BUNDLE_IDENTIFIER = org.libsdl.hidapi;
+ PRODUCT_NAME = hidapi;
+ SDKROOT = appletvos;
+ };
+ name = Debug;
+ };
+ A75FDB6D23E3A2C900529352 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_ENABLE_OBJC_WEAK = YES;
+ DYLIB_COMPATIBILITY_VERSION = 1;
+ DYLIB_CURRENT_VERSION = 1;
+ GCC_PREPROCESSOR_DEFINITIONS = "HID_API_EXPORT=\"__attribute__ ((visibility(\\\"default\\\")))\"";
+ INFOPLIST_FILE = hidapi/Info.plist;
+ PRODUCT_BUNDLE_IDENTIFIER = org.libsdl.hidapi;
+ PRODUCT_NAME = hidapi;
+ SDKROOT = appletvos;
+ };
+ name = Release;
+ };
A769B23B23E259AE00872273 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -9939,11 +10157,9 @@
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_LINK_OBJC_RUNTIME = NO;
GCC_PREPROCESSOR_DEFINITIONS = "IOS_DYLIB=1";
- INSTALL_PATH = "@rpath";
OTHER_LDFLAGS = "-liconv";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
- WRAPPER_EXTENSION = framework;
};
name = Debug;
};
@@ -9953,11 +10169,9 @@
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_LINK_OBJC_RUNTIME = NO;
GCC_PREPROCESSOR_DEFINITIONS = "IOS_DYLIB=1";
- INSTALL_PATH = "@rpath";
OTHER_LDFLAGS = "-liconv";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
- WRAPPER_EXTENSION = framework;
};
name = Release;
};
@@ -9967,10 +10181,8 @@
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_LINK_OBJC_RUNTIME = NO;
GCC_PREPROCESSOR_DEFINITIONS = "IOS_DYLIB=1";
- INSTALL_PATH = "@rpath";
OTHER_LDFLAGS = "-liconv";
SDKROOT = appletvos;
- WRAPPER_EXTENSION = framework;
};
name = Debug;
};
@@ -9980,10 +10192,8 @@
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_LINK_OBJC_RUNTIME = NO;
GCC_PREPROCESSOR_DEFINITIONS = "IOS_DYLIB=1";
- INSTALL_PATH = "@rpath";
OTHER_LDFLAGS = "-liconv";
SDKROOT = appletvos;
- WRAPPER_EXTENSION = framework;
};
name = Release;
};
@@ -10086,6 +10296,24 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
+ A75FDB5023E399AC00529352 /* Build configuration list for PBXNativeTarget "hidapi-iOS" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ A75FDB4E23E399AC00529352 /* Debug */,
+ A75FDB4F23E399AC00529352 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Debug;
+ };
+ A75FDB6B23E3A2C900529352 /* Build configuration list for PBXNativeTarget "hidapi-tvOS" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ A75FDB6C23E3A2C900529352 /* Debug */,
+ A75FDB6D23E3A2C900529352 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Debug;
+ };
A769B23A23E259AE00872273 /* Build configuration list for PBXNativeTarget "Static Library-tvOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
diff --git a/Xcode/SDL/hidapi/Info.plist b/Xcode/SDL/hidapi/Info.plist
new file mode 100644
index 0000000..9bcb244
--- /dev/null
+++ b/Xcode/SDL/hidapi/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>$(DEVELOPMENT_LANGUAGE)</string>
+ <key>CFBundleExecutable</key>
+ <string>$(EXECUTABLE_NAME)</string>
+ <key>CFBundleIdentifier</key>
+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>$(PRODUCT_NAME)</string>
+ <key>CFBundlePackageType</key>
+ <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
+ <key>CFBundleVersion</key>
+ <string>$(CURRENT_PROJECT_VERSION)</string>
+</dict>
+</plist>
diff --git a/src/hidapi/hidapi/hidapi.h b/src/hidapi/hidapi/hidapi.h
index de3e572..2c66319 100644
--- a/src/hidapi/hidapi/hidapi.h
+++ b/src/hidapi/hidapi/hidapi.h
@@ -33,9 +33,13 @@
#define HID_API_EXPORT __declspec(dllexport)
#define HID_API_CALL
#else
+#ifndef HID_API_EXPORT
#define HID_API_EXPORT /**< API export macro */
+#endif
+#ifndef HID_API_CALL
#define HID_API_CALL /**< API call macro */
#endif
+#endif
#define HID_API_EXPORT_CALL HID_API_EXPORT HID_API_CALL /**< API export and call macro*/