Don't build SDL_JOYSTICK_HIDAPI by default on iOS
authorSam Lantinga <slouken@libsdl.org>
Fri, 26 Oct 2018 09:27:31 -0700
changeset 12360a21c0a3bf183
parent 12359 691c32a30fb9
child 12361 60cdd518cf9b
Don't build SDL_JOYSTICK_HIDAPI by default on iOS
If you enable this, you'll need to link with CoreBluetooth.framework and add something like this to your Info.plist:
<key>NSBluetoothPeripheralUsageDescription</key>
<string>MyApp would like to remain connected to nearby bluetooth Game Controllers and Game Pads even when you're not using the app.</string>
Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj
Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj
include/SDL_config_iphoneos.h
src/hidapi/ios/hid.m
src/hidapi/libusb/hid.c
src/hidapi/linux/hid.c
src/hidapi/mac/hid.c
src/hidapi/windows/hid.c
     1.1 --- a/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj	Thu Oct 25 16:53:14 2018 -0700
     1.2 +++ b/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj	Fri Oct 26 09:27:31 2018 -0700
     1.3 @@ -10,13 +10,6 @@
     1.4  		1D3623EC0D0F72F000981E51 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D3623EB0D0F72F000981E51 /* CoreGraphics.framework */; };
     1.5  		1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
     1.6  		1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
     1.7 -		8A476D2B217923FE00FAEF79 /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A476D27217923FE00FAEF79 /* CoreBluetooth.framework */; };
     1.8 -		8A680883217924680074BD9A /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A476D27217923FE00FAEF79 /* CoreBluetooth.framework */; };
     1.9 -		8A680886217924B60074BD9A /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A476D27217923FE00FAEF79 /* CoreBluetooth.framework */; };
    1.10 -		8A680887217924D70074BD9A /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A476D27217923FE00FAEF79 /* CoreBluetooth.framework */; };
    1.11 -		8A680888217924F00074BD9A /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A476D27217923FE00FAEF79 /* CoreBluetooth.framework */; };
    1.12 -		8A6808892179250B0074BD9A /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A476D27217923FE00FAEF79 /* CoreBluetooth.framework */; };
    1.13 -		8A68088A217925270074BD9A /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A476D27217923FE00FAEF79 /* CoreBluetooth.framework */; };
    1.14  		FA30DEB01BBF5A8F009C397F /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = FD77A0060E26BC0500F39101 /* common.c */; };
    1.15  		FA30DEB11BBF5A93009C397F /* happy.c in Sources */ = {isa = PBXBuildFile; fileRef = FD77A0080E26BC0500F39101 /* happy.c */; };
    1.16  		FA30DEB31BBF5AD7009C397F /* icon.bmp in Resources */ = {isa = PBXBuildFile; fileRef = FDB651CC0E43D19800F688B5 /* icon.bmp */; };
    1.17 @@ -232,7 +225,6 @@
    1.18  		1D3623EB0D0F72F000981E51 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
    1.19  		1D6058910D05DD3D006BFB54 /* Rectangles.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Rectangles.app; sourceTree = BUILT_PRODUCTS_DIR; };
    1.20  		1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
    1.21 -		8A476D27217923FE00FAEF79 /* CoreBluetooth.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreBluetooth.framework; path = System/Library/Frameworks/CoreBluetooth.framework; sourceTree = SDKROOT; };
    1.22  		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
    1.23  		FA30DE961BBF59D9009C397F /* Happy-TV.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Happy-TV.app"; sourceTree = BUILT_PRODUCTS_DIR; };
    1.24  		FA86C0361D9765BA009CB637 /* iOS Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "iOS Launch Screen.storyboard"; sourceTree = "<group>"; };
    1.25 @@ -279,7 +271,6 @@
    1.26  			isa = PBXFrameworksBuildPhase;
    1.27  			buildActionMask = 2147483647;
    1.28  			files = (
    1.29 -				8A476D2B217923FE00FAEF79 /* CoreBluetooth.framework in Frameworks */,
    1.30  				FABA34D41D8B5E5600915323 /* AVFoundation.framework in Frameworks */,
    1.31  				FD1B48DD0E313255007AB34E /* libSDL2.a in Frameworks */,
    1.32  				FAE0E96A1BAF96A00098DFA4 /* GameController.framework in Frameworks */,
    1.33 @@ -315,7 +306,6 @@
    1.34  			isa = PBXFrameworksBuildPhase;
    1.35  			buildActionMask = 2147483647;
    1.36  			files = (
    1.37 -				8A680883217924680074BD9A /* CoreBluetooth.framework in Frameworks */,
    1.38  				FABA34D61D8B5E5A00915323 /* AVFoundation.framework in Frameworks */,
    1.39  				FD1B49980E313261007AB34E /* libSDL2.a in Frameworks */,
    1.40  				FAE0E96C1BAF96A90098DFA4 /* GameController.framework in Frameworks */,
    1.41 @@ -334,7 +324,6 @@
    1.42  			isa = PBXFrameworksBuildPhase;
    1.43  			buildActionMask = 2147483647;
    1.44  			files = (
    1.45 -				8A680886217924B60074BD9A /* CoreBluetooth.framework in Frameworks */,
    1.46  				FABA34D91D8B5E7B00915323 /* AVFoundation.framework in Frameworks */,
    1.47  				FD1B499C0E313269007AB34E /* libSDL2.a in Frameworks */,
    1.48  				FAE0E96D1BAF96AF0098DFA4 /* GameController.framework in Frameworks */,
    1.49 @@ -353,7 +342,6 @@
    1.50  			isa = PBXFrameworksBuildPhase;
    1.51  			buildActionMask = 2147483647;
    1.52  			files = (
    1.53 -				8A68088A217925270074BD9A /* CoreBluetooth.framework in Frameworks */,
    1.54  				FABA34DD1D8B5E8D00915323 /* AVFoundation.framework in Frameworks */,
    1.55  				FDB652000E43D1F300F688B5 /* libSDL2.a in Frameworks */,
    1.56  				FAE0E9711BAF96BB0098DFA4 /* GameController.framework in Frameworks */,
    1.57 @@ -372,7 +360,6 @@
    1.58  			isa = PBXFrameworksBuildPhase;
    1.59  			buildActionMask = 2147483647;
    1.60  			files = (
    1.61 -				8A680887217924D70074BD9A /* CoreBluetooth.framework in Frameworks */,
    1.62  				FABA34DA1D8B5E7F00915323 /* AVFoundation.framework in Frameworks */,
    1.63  				FD1B499E0E31326C007AB34E /* libSDL2.a in Frameworks */,
    1.64  				FAE0E96E1BAF96B10098DFA4 /* GameController.framework in Frameworks */,
    1.65 @@ -391,7 +378,6 @@
    1.66  			isa = PBXFrameworksBuildPhase;
    1.67  			buildActionMask = 2147483647;
    1.68  			files = (
    1.69 -				8A6808892179250B0074BD9A /* CoreBluetooth.framework in Frameworks */,
    1.70  				FABA34DC1D8B5E8900915323 /* AVFoundation.framework in Frameworks */,
    1.71  				FD1B49A20E313273007AB34E /* libSDL2.a in Frameworks */,
    1.72  				FAE0E9701BAF96B80098DFA4 /* GameController.framework in Frameworks */,
    1.73 @@ -410,7 +396,6 @@
    1.74  			isa = PBXFrameworksBuildPhase;
    1.75  			buildActionMask = 2147483647;
    1.76  			files = (
    1.77 -				8A680888217924F00074BD9A /* CoreBluetooth.framework in Frameworks */,
    1.78  				FABA34DB1D8B5E8500915323 /* AVFoundation.framework in Frameworks */,
    1.79  				FD1B49A00E313270007AB34E /* libSDL2.a in Frameworks */,
    1.80  				FAE0E96F1BAF96B50098DFA4 /* GameController.framework in Frameworks */,
    1.81 @@ -470,7 +455,6 @@
    1.82  		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
    1.83  			isa = PBXGroup;
    1.84  			children = (
    1.85 -				8A476D27217923FE00FAEF79 /* CoreBluetooth.framework */,
    1.86  				FABA34D71D8B5E7700915323 /* AVFoundation.framework */,
    1.87  				FABA34D31D8B5E5600915323 /* AVFoundation.framework */,
    1.88  				FAE0E9691BAF96A00098DFA4 /* GameController.framework */,
     2.1 --- a/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj	Thu Oct 25 16:53:14 2018 -0700
     2.2 +++ b/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj	Fri Oct 26 09:27:31 2018 -0700
     2.3 @@ -26,34 +26,6 @@
     2.4  		047A63E813285C3200CD7973 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A89D0E2D111A00EA573E /* Foundation.framework */; };
     2.5  		047A63E913285C3200CD7973 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A89E0E2D111A00EA573E /* CoreAudio.framework */; };
     2.6  		047A63F113285CD100CD7973 /* checkkeys.c in Sources */ = {isa = PBXBuildFile; fileRef = 047A63F013285CD100CD7973 /* checkkeys.c */; };
     2.7 -		55FFA91C212232BA00D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
     2.8 -		55FFA91D212232BF00D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
     2.9 -		55FFA91E212232BF00D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.10 -		55FFA91F212232C000D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.11 -		55FFA920212232C000D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.12 -		55FFA921212232C100D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.13 -		55FFA922212232C100D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.14 -		55FFA923212232C200D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.15 -		55FFA924212232C200D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.16 -		55FFA925212232C300D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.17 -		55FFA926212232C300D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.18 -		55FFA927212232C500D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.19 -		55FFA928212232C500D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.20 -		55FFA929212232C600D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.21 -		55FFA92A212232C600D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.22 -		55FFA92B212232C700D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.23 -		55FFA92C212232C700D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.24 -		55FFA92D212232C800D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.25 -		55FFA92E212232CA00D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.26 -		55FFA92F212232CA00D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.27 -		55FFA930212232CB00D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.28 -		55FFA931212232CB00D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.29 -		55FFA932212232CC00D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.30 -		55FFA933212232CC00D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.31 -		55FFA934212232CD00D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.32 -		55FFA935212232CE00D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.33 -		55FFA936212232CE00D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.34 -		55FFA937212232CF00D7CBED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */; };
    2.35  		56ED04FE118A8FE400A56AA6 /* icon.bmp in Resources */ = {isa = PBXBuildFile; fileRef = FDA8AAD90E2D33B000EA573E /* icon.bmp */; };
    2.36  		56ED0502118A8FE400A56AA6 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
    2.37  		56ED0503118A8FE400A56AA6 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8980E2D111A00EA573E /* AudioToolbox.framework */; };
    2.38 @@ -451,7 +423,6 @@
    2.39  		047A63ED13285C3200CD7973 /* checkkeys.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = checkkeys.app; sourceTree = BUILT_PRODUCTS_DIR; };
    2.40  		047A63F013285CD100CD7973 /* checkkeys.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = checkkeys.c; sourceTree = "<group>"; };
    2.41  		1D6058910D05DD3D006BFB54 /* testwm2.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testwm2.app; sourceTree = BUILT_PRODUCTS_DIR; };
    2.42 -		55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreBluetooth.framework; path = System/Library/Frameworks/CoreBluetooth.framework; sourceTree = SDKROOT; };
    2.43  		56ED050D118A8FE400A56AA6 /* testpower.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testpower.app; sourceTree = BUILT_PRODUCTS_DIR; };
    2.44  		56ED0510118A904200A56AA6 /* testpower.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testpower.c; sourceTree = "<group>"; };
    2.45  		AA13B3261FB8AEBC00D9FEE6 /* testyuv.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testyuv.app; sourceTree = BUILT_PRODUCTS_DIR; };
    2.46 @@ -543,7 +514,6 @@
    2.47  				046CEF7F13254F23007AD51D /* CoreGraphics.framework in Frameworks */,
    2.48  				046CEF8013254F23007AD51D /* UIKit.framework in Frameworks */,
    2.49  				046CEF8113254F23007AD51D /* Foundation.framework in Frameworks */,
    2.50 -				55FFA926212232C300D7CBED /* CoreBluetooth.framework in Frameworks */,
    2.51  				046CEF8213254F23007AD51D /* CoreAudio.framework in Frameworks */,
    2.52  			);
    2.53  			runOnlyForDeploymentPostprocessing = 0;
    2.54 @@ -552,7 +522,6 @@
    2.55  			isa = PBXFrameworksBuildPhase;
    2.56  			buildActionMask = 2147483647;
    2.57  			files = (
    2.58 -				55FFA91C212232BA00D7CBED /* CoreBluetooth.framework in Frameworks */,
    2.59  				FABA34B01D8B5B6400915323 /* AVFoundation.framework in Frameworks */,
    2.60  				AA1EE470176059D00029C7A5 /* libSDL2test.a in Frameworks */,
    2.61  				047A63E213285C3200CD7973 /* libSDL2.a in Frameworks */,
    2.62 @@ -575,7 +544,6 @@
    2.63  				FABA34C41D8B5BCB00915323 /* AVFoundation.framework in Frameworks */,
    2.64  				AA1EE47817605BF60029C7A5 /* libSDL2test.a in Frameworks */,
    2.65  				FDBDE5810E313465006BAC0B /* libSDL2.a in Frameworks */,
    2.66 -				55FFA935212232CE00D7CBED /* CoreBluetooth.framework in Frameworks */,
    2.67  				FA684F931BAF1A8A00DCFD1A /* GameController.framework in Frameworks */,
    2.68  				FA8B4BE0196766F400F8EB7C /* CoreMotion.framework in Frameworks */,
    2.69  				FDA8A89F0E2D111A00EA573E /* AudioToolbox.framework in Frameworks */,
    2.70 @@ -602,7 +570,6 @@
    2.71  				56ED0506118A8FE400A56AA6 /* CoreGraphics.framework in Frameworks */,
    2.72  				56ED0507118A8FE400A56AA6 /* UIKit.framework in Frameworks */,
    2.73  				56ED0508118A8FE400A56AA6 /* Foundation.framework in Frameworks */,
    2.74 -				55FFA92D212232C800D7CBED /* CoreBluetooth.framework in Frameworks */,
    2.75  				56ED0509118A8FE400A56AA6 /* CoreAudio.framework in Frameworks */,
    2.76  			);
    2.77  			runOnlyForDeploymentPostprocessing = 0;
    2.78 @@ -614,7 +581,6 @@
    2.79  				AA13B3171FB8AEBC00D9FEE6 /* AVFoundation.framework in Frameworks */,
    2.80  				AA13B3181FB8AEBC00D9FEE6 /* libSDL2test.a in Frameworks */,
    2.81  				AA13B3191FB8AEBC00D9FEE6 /* libSDL2.a in Frameworks */,
    2.82 -				55FFA936212232CE00D7CBED /* CoreBluetooth.framework in Frameworks */,
    2.83  				AA13B31A1FB8AEBC00D9FEE6 /* GameController.framework in Frameworks */,
    2.84  				AA13B31B1FB8AEBC00D9FEE6 /* CoreMotion.framework in Frameworks */,
    2.85  				AA13B31C1FB8AEBC00D9FEE6 /* AudioToolbox.framework in Frameworks */,
    2.86 @@ -634,7 +600,6 @@
    2.87  				FABA34BE1D8B5BB000915323 /* AVFoundation.framework in Frameworks */,
    2.88  				AA1EE47617605B9E0029C7A5 /* libSDL2test.a in Frameworks */,
    2.89  				AAE7DEE114CBB1E100DF1A0E /* libSDL2.a in Frameworks */,
    2.90 -				55FFA92F212232CA00D7CBED /* CoreBluetooth.framework in Frameworks */,
    2.91  				FA684F8D1BAF1A7800DCFD1A /* GameController.framework in Frameworks */,
    2.92  				FA8B4BDA196766E200F8EB7C /* CoreMotion.framework in Frameworks */,
    2.93  				AAE7DEE214CBB1E100DF1A0E /* AudioToolbox.framework in Frameworks */,
    2.94 @@ -655,7 +620,6 @@
    2.95  				FABA34BD1D8B5BAB00915323 /* AVFoundation.framework in Frameworks */,
    2.96  				AA1EE47517605B930029C7A5 /* libSDL2test.a in Frameworks */,
    2.97  				AAE7DFA614CBB54E00DF1A0E /* libSDL2.a in Frameworks */,
    2.98 -				55FFA92E212232CA00D7CBED /* CoreBluetooth.framework in Frameworks */,
    2.99  				FA684F8C1BAF1A7400DCFD1A /* GameController.framework in Frameworks */,
   2.100  				FA8B4BD9196766E000F8EB7C /* CoreMotion.framework in Frameworks */,
   2.101  				AAE7DFA714CBB54E00DF1A0E /* AudioToolbox.framework in Frameworks */,
   2.102 @@ -680,7 +644,6 @@
   2.103  				FA3D994D1BC4E6AD002C96C8 /* CoreGraphics.framework in Frameworks */,
   2.104  				FA3D994E1BC4E6AD002C96C8 /* UIKit.framework in Frameworks */,
   2.105  				FA3D994F1BC4E6AD002C96C8 /* Foundation.framework in Frameworks */,
   2.106 -				55FFA925212232C300D7CBED /* CoreBluetooth.framework in Frameworks */,
   2.107  				FA3D99501BC4E6AD002C96C8 /* CoreAudio.framework in Frameworks */,
   2.108  			);
   2.109  			runOnlyForDeploymentPostprocessing = 0;
   2.110 @@ -699,7 +662,6 @@
   2.111  				FABA348A1D8B575200915323 /* CoreGraphics.framework in Frameworks */,
   2.112  				FABA348B1D8B575200915323 /* UIKit.framework in Frameworks */,
   2.113  				FABA348C1D8B575200915323 /* Foundation.framework in Frameworks */,
   2.114 -				55FFA91D212232BF00D7CBED /* CoreBluetooth.framework in Frameworks */,
   2.115  				FABA348D1D8B575200915323 /* CoreAudio.framework in Frameworks */,
   2.116  			);
   2.117  			runOnlyForDeploymentPostprocessing = 0;
   2.118 @@ -718,7 +680,6 @@
   2.119  				FABA34A31D8B582100915323 /* CoreGraphics.framework in Frameworks */,
   2.120  				FABA34A41D8B582100915323 /* UIKit.framework in Frameworks */,
   2.121  				FABA34A51D8B582100915323 /* Foundation.framework in Frameworks */,
   2.122 -				55FFA91F212232C000D7CBED /* CoreBluetooth.framework in Frameworks */,
   2.123  				FABA34A61D8B582100915323 /* CoreAudio.framework in Frameworks */,
   2.124  			);
   2.125  			runOnlyForDeploymentPostprocessing = 0;
   2.126 @@ -737,7 +698,6 @@
   2.127  				FAE0E98C1BAF9B230098DFA4 /* CoreGraphics.framework in Frameworks */,
   2.128  				FAE0E98D1BAF9B230098DFA4 /* UIKit.framework in Frameworks */,
   2.129  				FAE0E98E1BAF9B230098DFA4 /* Foundation.framework in Frameworks */,
   2.130 -				55FFA924212232C200D7CBED /* CoreBluetooth.framework in Frameworks */,
   2.131  				FAE0E98F1BAF9B230098DFA4 /* CoreAudio.framework in Frameworks */,
   2.132  			);
   2.133  			runOnlyForDeploymentPostprocessing = 0;
   2.134 @@ -756,7 +716,6 @@
   2.135  				FDA8AAB40E2D330F00EA573E /* CoreGraphics.framework in Frameworks */,
   2.136  				FDA8AAB50E2D330F00EA573E /* UIKit.framework in Frameworks */,
   2.137  				FDA8AAB60E2D330F00EA573E /* Foundation.framework in Frameworks */,
   2.138 -				55FFA91E212232BF00D7CBED /* CoreBluetooth.framework in Frameworks */,
   2.139  				FDA8AAB70E2D330F00EA573E /* CoreAudio.framework in Frameworks */,
   2.140  			);
   2.141  			runOnlyForDeploymentPostprocessing = 0;
   2.142 @@ -775,7 +734,6 @@
   2.143  				FDAAC3C60E2D47E6001DB1D8 /* CoreGraphics.framework in Frameworks */,
   2.144  				FDAAC3C70E2D47E6001DB1D8 /* UIKit.framework in Frameworks */,
   2.145  				FDAAC3C80E2D47E6001DB1D8 /* Foundation.framework in Frameworks */,
   2.146 -				55FFA920212232C000D7CBED /* CoreBluetooth.framework in Frameworks */,
   2.147  				FDAAC3C90E2D47E6001DB1D8 /* CoreAudio.framework in Frameworks */,
   2.148  			);
   2.149  			runOnlyForDeploymentPostprocessing = 0;
   2.150 @@ -794,7 +752,6 @@
   2.151  				FDAAC5940E2D5429001DB1D8 /* CoreGraphics.framework in Frameworks */,
   2.152  				FDAAC5950E2D5429001DB1D8 /* UIKit.framework in Frameworks */,
   2.153  				FDAAC5960E2D5429001DB1D8 /* Foundation.framework in Frameworks */,
   2.154 -				55FFA923212232C200D7CBED /* CoreBluetooth.framework in Frameworks */,
   2.155  				FDAAC5970E2D5429001DB1D8 /* CoreAudio.framework in Frameworks */,
   2.156  			);
   2.157  			runOnlyForDeploymentPostprocessing = 0;
   2.158 @@ -813,7 +770,6 @@
   2.159  				FDAAC5C20E2D55B5001DB1D8 /* CoreGraphics.framework in Frameworks */,
   2.160  				FDAAC5C30E2D55B5001DB1D8 /* UIKit.framework in Frameworks */,
   2.161  				FDAAC5C40E2D55B5001DB1D8 /* Foundation.framework in Frameworks */,
   2.162 -				55FFA922212232C100D7CBED /* CoreBluetooth.framework in Frameworks */,
   2.163  				FDAAC5C50E2D55B5001DB1D8 /* CoreAudio.framework in Frameworks */,
   2.164  			);
   2.165  			runOnlyForDeploymentPostprocessing = 0;
   2.166 @@ -825,7 +781,6 @@
   2.167  				FABA34B61D8B5B8900915323 /* AVFoundation.framework in Frameworks */,
   2.168  				AA1EE47417605B5C0029C7A5 /* libSDL2test.a in Frameworks */,
   2.169  				FDBDE57C0E313445006BAC0B /* libSDL2.a in Frameworks */,
   2.170 -				55FFA927212232C500D7CBED /* CoreBluetooth.framework in Frameworks */,
   2.171  				FA684F851BAF1A6000DCFD1A /* GameController.framework in Frameworks */,
   2.172  				FA8B4BD2196766CB00F8EB7C /* CoreMotion.framework in Frameworks */,
   2.173  				FDAAC61C0E2D5914001DB1D8 /* AudioToolbox.framework in Frameworks */,
   2.174 @@ -846,7 +801,6 @@
   2.175  				FABA34B21D8B5B7300915323 /* AVFoundation.framework in Frameworks */,
   2.176  				AA1EE47117605A7F0029C7A5 /* libSDL2test.a in Frameworks */,
   2.177  				FDC42FF40F0D866D009C87E1 /* libSDL2.a in Frameworks */,
   2.178 -				55FFA921212232C100D7CBED /* CoreBluetooth.framework in Frameworks */,
   2.179  				FA684F811BAF1A5300DCFD1A /* GameController.framework in Frameworks */,
   2.180  				FA8B4BCE196766C100F8EB7C /* CoreMotion.framework in Frameworks */,
   2.181  				FDC42FF60F0D866D009C87E1 /* AudioToolbox.framework in Frameworks */,
   2.182 @@ -873,7 +827,6 @@
   2.183  				FDD2C1030E2E4F4B00B7A85F /* CoreGraphics.framework in Frameworks */,
   2.184  				FDD2C1040E2E4F4B00B7A85F /* UIKit.framework in Frameworks */,
   2.185  				FDD2C1050E2E4F4B00B7A85F /* Foundation.framework in Frameworks */,
   2.186 -				55FFA932212232CC00D7CBED /* CoreBluetooth.framework in Frameworks */,
   2.187  				FDD2C1060E2E4F4B00B7A85F /* CoreAudio.framework in Frameworks */,
   2.188  			);
   2.189  			runOnlyForDeploymentPostprocessing = 0;
   2.190 @@ -892,7 +845,6 @@
   2.191  				FDD2C17A0E2E52C000B7A85F /* CoreGraphics.framework in Frameworks */,
   2.192  				FDD2C17B0E2E52C000B7A85F /* UIKit.framework in Frameworks */,
   2.193  				FDD2C17C0E2E52C000B7A85F /* Foundation.framework in Frameworks */,
   2.194 -				55FFA928212232C500D7CBED /* CoreBluetooth.framework in Frameworks */,
   2.195  				FDD2C17D0E2E52C000B7A85F /* CoreAudio.framework in Frameworks */,
   2.196  			);
   2.197  			runOnlyForDeploymentPostprocessing = 0;
   2.198 @@ -911,7 +863,6 @@
   2.199  				FDD2C19E0E2E534F00B7A85F /* CoreGraphics.framework in Frameworks */,
   2.200  				FDD2C19F0E2E534F00B7A85F /* UIKit.framework in Frameworks */,
   2.201  				FDD2C1A00E2E534F00B7A85F /* Foundation.framework in Frameworks */,
   2.202 -				55FFA929212232C600D7CBED /* CoreBluetooth.framework in Frameworks */,
   2.203  				FDD2C1A10E2E534F00B7A85F /* CoreAudio.framework in Frameworks */,
   2.204  			);
   2.205  			runOnlyForDeploymentPostprocessing = 0;
   2.206 @@ -930,7 +881,6 @@
   2.207  				FDD2C4570E2E773800B7A85F /* CoreGraphics.framework in Frameworks */,
   2.208  				FDD2C4580E2E773800B7A85F /* UIKit.framework in Frameworks */,
   2.209  				FDD2C4590E2E773800B7A85F /* Foundation.framework in Frameworks */,
   2.210 -				55FFA92A212232C600D7CBED /* CoreBluetooth.framework in Frameworks */,
   2.211  				FDD2C45A0E2E773800B7A85F /* CoreAudio.framework in Frameworks */,
   2.212  			);
   2.213  			runOnlyForDeploymentPostprocessing = 0;
   2.214 @@ -949,7 +899,6 @@
   2.215  				FDD2C4750E2E77D700B7A85F /* CoreGraphics.framework in Frameworks */,
   2.216  				FDD2C4760E2E77D700B7A85F /* UIKit.framework in Frameworks */,
   2.217  				FDD2C4770E2E77D700B7A85F /* Foundation.framework in Frameworks */,
   2.218 -				55FFA92B212232C700D7CBED /* CoreBluetooth.framework in Frameworks */,
   2.219  				FDD2C4780E2E77D700B7A85F /* CoreAudio.framework in Frameworks */,
   2.220  			);
   2.221  			runOnlyForDeploymentPostprocessing = 0;
   2.222 @@ -968,7 +917,6 @@
   2.223  				FDD2C5040E2E7F4800B7A85F /* CoreGraphics.framework in Frameworks */,
   2.224  				FDD2C5050E2E7F4800B7A85F /* UIKit.framework in Frameworks */,
   2.225  				FDD2C5060E2E7F4800B7A85F /* Foundation.framework in Frameworks */,
   2.226 -				55FFA92C212232C700D7CBED /* CoreBluetooth.framework in Frameworks */,
   2.227  				FDD2C5070E2E7F4800B7A85F /* CoreAudio.framework in Frameworks */,
   2.228  			);
   2.229  			runOnlyForDeploymentPostprocessing = 0;
   2.230 @@ -987,7 +935,6 @@
   2.231  				FDD2C5220E2E807600B7A85F /* CoreGraphics.framework in Frameworks */,
   2.232  				FDD2C5230E2E807600B7A85F /* UIKit.framework in Frameworks */,
   2.233  				FDD2C5240E2E807600B7A85F /* Foundation.framework in Frameworks */,
   2.234 -				55FFA930212232CB00D7CBED /* CoreBluetooth.framework in Frameworks */,
   2.235  				FDD2C5250E2E807600B7A85F /* CoreAudio.framework in Frameworks */,
   2.236  			);
   2.237  			runOnlyForDeploymentPostprocessing = 0;
   2.238 @@ -1000,7 +947,6 @@
   2.239  				FABA34C01D8B5BBA00915323 /* AVFoundation.framework in Frameworks */,
   2.240  				AA1EE47717605BAB0029C7A5 /* libSDL2test.a in Frameworks */,
   2.241  				FDBDE5CA0E313712006BAC0B /* libSDL2.a in Frameworks */,
   2.242 -				55FFA931212232CB00D7CBED /* CoreBluetooth.framework in Frameworks */,
   2.243  				FA684F8F1BAF1A7E00DCFD1A /* GameController.framework in Frameworks */,
   2.244  				FA8B4BDC196766E800F8EB7C /* CoreMotion.framework in Frameworks */,
   2.245  				FDD2C5440E2E80E400B7A85F /* AudioToolbox.framework in Frameworks */,
   2.246 @@ -1027,7 +973,6 @@
   2.247  				FDD2C5800E2E8C7400B7A85F /* CoreGraphics.framework in Frameworks */,
   2.248  				FDD2C5810E2E8C7400B7A85F /* UIKit.framework in Frameworks */,
   2.249  				FDD2C5820E2E8C7400B7A85F /* Foundation.framework in Frameworks */,
   2.250 -				55FFA934212232CD00D7CBED /* CoreBluetooth.framework in Frameworks */,
   2.251  				FDD2C5830E2E8C7400B7A85F /* CoreAudio.framework in Frameworks */,
   2.252  			);
   2.253  			runOnlyForDeploymentPostprocessing = 0;
   2.254 @@ -1046,7 +991,6 @@
   2.255  				FDD2C5BE0E2E8CFC00B7A85F /* CoreGraphics.framework in Frameworks */,
   2.256  				FDD2C5BF0E2E8CFC00B7A85F /* UIKit.framework in Frameworks */,
   2.257  				FDD2C5C00E2E8CFC00B7A85F /* Foundation.framework in Frameworks */,
   2.258 -				55FFA933212232CC00D7CBED /* CoreBluetooth.framework in Frameworks */,
   2.259  				FDD2C5C10E2E8CFC00B7A85F /* CoreAudio.framework in Frameworks */,
   2.260  			);
   2.261  			runOnlyForDeploymentPostprocessing = 0;
   2.262 @@ -1065,7 +1009,6 @@
   2.263  				FDD2C6ED0E2E959E00B7A85F /* CoreGraphics.framework in Frameworks */,
   2.264  				FDD2C6EE0E2E959E00B7A85F /* UIKit.framework in Frameworks */,
   2.265  				FDD2C6EF0E2E959E00B7A85F /* Foundation.framework in Frameworks */,
   2.266 -				55FFA937212232CF00D7CBED /* CoreBluetooth.framework in Frameworks */,
   2.267  				FDD2C6F00E2E959E00B7A85F /* CoreAudio.framework in Frameworks */,
   2.268  			);
   2.269  			runOnlyForDeploymentPostprocessing = 0;
   2.270 @@ -1188,7 +1131,6 @@
   2.271  		FDA8A7C30E2D10FA00EA573E /* Frameworks */ = {
   2.272  			isa = PBXGroup;
   2.273  			children = (
   2.274 -				55FFA91B212232BA00D7CBED /* CoreBluetooth.framework */,
   2.275  				FA684F7A1BAF1A4400DCFD1A /* GameController.framework */,
   2.276  				FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */,
   2.277  				FDA8A8980E2D111A00EA573E /* AudioToolbox.framework */,
     3.1 --- a/include/SDL_config_iphoneos.h	Thu Oct 25 16:53:14 2018 -0700
     3.2 +++ b/include/SDL_config_iphoneos.h	Fri Oct 26 09:27:31 2018 -0700
     3.3 @@ -137,7 +137,7 @@
     3.4  
     3.5  /* Enable MFi joystick support */
     3.6  #define SDL_JOYSTICK_MFI 1
     3.7 -#define SDL_JOYSTICK_HIDAPI 1
     3.8 +/*#define SDL_JOYSTICK_HIDAPI 1*/
     3.9  
    3.10  #ifdef __TVOS__
    3.11  #define SDL_SENSOR_DUMMY    1
     4.1 --- a/src/hidapi/ios/hid.m	Thu Oct 25 16:53:14 2018 -0700
     4.2 +++ b/src/hidapi/ios/hid.m	Fri Oct 26 09:27:31 2018 -0700
     4.3 @@ -3,6 +3,9 @@
     4.4  // Purpose: HID device abstraction temporary stub
     4.5  //
     4.6  //=============================================================================
     4.7 +#include "../../SDL_internal.h"
     4.8 +
     4.9 +#ifdef SDL_JOYSTICK_HIDAPI
    4.10  
    4.11  #include <CoreBluetooth/CoreBluetooth.h>
    4.12  #include <QuartzCore/QuartzCore.h>
    4.13 @@ -907,3 +910,5 @@
    4.14  #endif
    4.15  	return result;
    4.16  }
    4.17 +
    4.18 +#endif /* SDL_JOYSTICK_HIDAPI */
     5.1 --- a/src/hidapi/libusb/hid.c	Thu Oct 25 16:53:14 2018 -0700
     5.2 +++ b/src/hidapi/libusb/hid.c	Fri Oct 26 09:27:31 2018 -0700
     5.3 @@ -22,6 +22,9 @@
     5.4   code repository located at:
     5.5          http://github.com/signal11/hidapi .
     5.6  ********************************************************/
     5.7 +#include "../../SDL_internal.h"
     5.8 +
     5.9 +#ifdef SDL_JOYSTICK_HIDAPI
    5.10  
    5.11  #ifndef _GNU_SOURCE
    5.12  #define _GNU_SOURCE /* needed for wcsdup() before glibc 2.10 */
    5.13 @@ -1613,3 +1616,5 @@
    5.14  #ifdef NAMESPACE
    5.15  }
    5.16  #endif
    5.17 +
    5.18 +#endif /* SDL_JOYSTICK_HIDAPI */
     6.1 --- a/src/hidapi/linux/hid.c	Thu Oct 25 16:53:14 2018 -0700
     6.2 +++ b/src/hidapi/linux/hid.c	Fri Oct 26 09:27:31 2018 -0700
     6.3 @@ -20,6 +20,9 @@
     6.4   code repository located at:
     6.5          http://github.com/signal11/hidapi .
     6.6  ********************************************************/
     6.7 +#include "../../SDL_internal.h"
     6.8 +
     6.9 +#ifdef SDL_JOYSTICK_HIDAPI
    6.10  
    6.11  #ifndef _GNU_SOURCE
    6.12  #define _GNU_SOURCE /* needed for wcsdup() before glibc 2.10 */
    6.13 @@ -891,3 +894,5 @@
    6.14  #ifdef NAMESPACE
    6.15  }
    6.16  #endif
    6.17 +
    6.18 +#endif /* SDL_JOYSTICK_HIDAPI */
     7.1 --- a/src/hidapi/mac/hid.c	Thu Oct 25 16:53:14 2018 -0700
     7.2 +++ b/src/hidapi/mac/hid.c	Fri Oct 26 09:27:31 2018 -0700
     7.3 @@ -19,6 +19,9 @@
     7.4   code repository located at:
     7.5   http://github.com/signal11/hidapi .
     7.6   ********************************************************/
     7.7 +#include "../../SDL_internal.h"
     7.8 +
     7.9 +#ifdef SDL_JOYSTICK_HIDAPI
    7.10  
    7.11  /* See Apple Technical Note TN2187 for details on IOHidManager. */
    7.12  
    7.13 @@ -1184,3 +1187,5 @@
    7.14  	return 0;
    7.15  }
    7.16  #endif
    7.17 +
    7.18 +#endif /* SDL_JOYSTICK_HIDAPI */
     8.1 --- a/src/hidapi/windows/hid.c	Thu Oct 25 16:53:14 2018 -0700
     8.2 +++ b/src/hidapi/windows/hid.c	Fri Oct 26 09:27:31 2018 -0700
     8.3 @@ -19,6 +19,9 @@
     8.4   code repository located at:
     8.5          http://github.com/signal11/hidapi .
     8.6  ********************************************************/
     8.7 +#include "../../SDL_internal.h"
     8.8 +
     8.9 +#ifdef SDL_JOYSTICK_HIDAPI
    8.10  
    8.11  #include <windows.h>
    8.12  
    8.13 @@ -39,7 +42,6 @@
    8.14  #endif
    8.15  
    8.16  /* SDL C runtime functions */
    8.17 -#include "../../SDL_internal.h"
    8.18  #include "SDL_stdinc.h"
    8.19  
    8.20  #define calloc SDL_calloc
    8.21 @@ -982,3 +984,5 @@
    8.22  #ifdef __cplusplus
    8.23  } /* extern "C" */
    8.24  #endif
    8.25 +
    8.26 +#endif /* SDL_JOYSTICK_HIDAPI */