The-Homebrew-Cloud/Ryujinx-SDL
2
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2024-09-21 06:30:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added SDL_HIDAPI_DISABLED so it can be disabled like other SDL subsystems

Browse Source
This commit is contained in:
Sam Lantinga 2021-11-08 07:19:45 -08:00
parent 2a6feb5011
commit b8327a4a48
11 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/SDL_config.h.cmake
View File

@ -266,6 +266,7 @@
#cmakedefine SDL_FILE_DISABLED @SDL_FILE_DISABLED@
#cmakedefine SDL_JOYSTICK_DISABLED @SDL_JOYSTICK_DISABLED@
#cmakedefine SDL_HAPTIC_DISABLED @SDL_HAPTIC_DISABLED@
#cmakedefine SDL_HIDAPI_DISABLED @SDL_HIDAPI_DISABLED@
#cmakedefine SDL_SENSOR_DISABLED @SDL_SENSOR_DISABLED@
#cmakedefine SDL_LOADSO_DISABLED @SDL_LOADSO_DISABLED@
#cmakedefine SDL_RENDER_DISABLED @SDL_RENDER_DISABLED@

1
include/SDL_config.h.in
View File

@ -253,6 +253,7 @@
#undef SDL_FILE_DISABLED
#undef SDL_JOYSTICK_DISABLED
#undef SDL_HAPTIC_DISABLED
#undef SDL_HIDAPI_DISABLED
#undef SDL_SENSOR_DISABLED
#undef SDL_LOADSO_DISABLED
#undef SDL_RENDER_DISABLED

1
include/SDL_config_emscripten.h
View File

@ -134,6 +134,7 @@
#define SDL_CPUINFO_DISABLED 1
#define SDL_HAPTIC_DISABLED 1
#define SDL_HIDAPI_DISABLED 1
#ifndef __EMSCRIPTEN_PTHREADS__
#define SDL_THREADS_DISABLED 1
#endif

3
include/SDL_config_minimal.h
View File

@ -64,6 +64,9 @@ typedef unsigned long uintptr_t;
/* Enable the stub haptic driver (src/haptic/dummy/\*.c) */
#define SDL_HAPTIC_DISABLED 1
/* Enable the stub HIDAPI */
#define SDL_HIDAPI_DISABLED 1
/* Enable the stub sensor driver (src/sensor/dummy/\*.c) */
#define SDL_SENSOR_DISABLED 1

4
include/SDL_config_os2.h
View File

@ -33,14 +33,12 @@
#define SDL_POWER_DISABLED 1
#define SDL_HAPTIC_DISABLED 1
#define SDL_HIDAPI_DISABLED 1
#define SDL_SENSOR_DUMMY 1
#define SDL_VIDEO_DRIVER_DUMMY 1
#define SDL_VIDEO_DRIVER_OS2 1
#define SDL_JOYSTICK_OS2 1
#define SDL_DISABLE_HIDAPI 1
/*#undef SDL_JOYSTICK_HIDAPI */
/*#undef SDL_JOYSTICK_VIRTUAL */
/* Enable OpenGL support */
/* #undef SDL_VIDEO_OPENGL */

3
include/SDL_config_psp.h
View File

@ -158,6 +158,9 @@
/* PSP doesn't have haptic device (src/haptic/dummy/\*.c) */
#define SDL_HAPTIC_DISABLED 1
/* PSP doesn't have HIDAPI available */
#define SDL_HIDAPI_DISABLED 1
/* PSP can't load shared object (src/loadso/dummy/\*.c) */
#define SDL_LOADSO_DISABLED 1

3
include/SDL_config_winrt.h
View File

@ -205,6 +205,9 @@ typedef unsigned int uintptr_t;
#define SDL_HAPTIC_XINPUT 1
#endif
/* WinRT doesn't have HIDAPI available */
#define SDL_HIDAPI_DISABLED 1
/* Enable the dummy sensor driver */
#define SDL_SENSOR_DUMMY 1

4
include/SDL_hidapi.h
View File

@ -55,8 +55,8 @@
POSSIBILITY OF SUCH DAMAGE.
*
* If you would like a version of SDL without this code, you can build SDL
* with SDL_DISABLE_HIDAPI defined. You might want to do this for example on
* iOS or tvOS to avoid a dependency on the CoreBluetooth framework.
* with SDL_HIDAPI_DISABLED defined to 1. You might want to do this for example
* on iOS or tvOS to avoid a dependency on the CoreBluetooth framework.
*/
#ifndef SDL_hidapi_h_

8
src/hidapi/SDL_hidapi.c
View File

@ -33,7 +33,7 @@
#include "SDL_hidapi.h"
#include "SDL_hidapi_c.h"
#ifndef SDL_DISABLE_HIDAPI
#if !SDL_HIDAPI_DISABLED
/* Platform HIDAPI Implementation */
@ -350,7 +350,7 @@ SDL_libusb_get_string_descriptor(libusb_device_handle *dev,
#endif /* SDL_LIBUSB_DYNAMIC */
#endif /* !SDL_DISABLE_HIDAPI */
#endif /* !SDL_HIDAPI_DISABLED */
/* Shared HIDAPI Implementation */
@ -469,7 +469,7 @@ DeleteHIDDeviceWrapper(HIDDeviceWrapper *device)
return retval; \
}
#ifndef SDL_DISABLE_HIDAPI
#if !SDL_HIDAPI_DISABLED
#define COPY_IF_EXISTS(var) \
if (pSrc->var != NULL) { \
@ -506,7 +506,7 @@ CopyHIDDeviceInfo(struct SDL_hid_device_info *pSrc, struct SDL_hid_device_info *
#undef COPY_IF_EXISTS
#undef WCOPY_IF_EXISTS
#endif /* SDL_DISABLE_HIDAPI */
#endif /* !SDL_HIDAPI_DISABLED */
static SDL_bool SDL_hidapi_wasinit = SDL_FALSE;

4
src/hidapi/android/hid.cpp
View File

@ -22,7 +22,7 @@
//
// This layer glues the hidapi API to Android's USB and BLE stack.
#ifndef SDL_DISABLE_HIDAPI
#if !SDL_HIDAPI_DISABLED
#define hid_init PLATFORM_hid_init
#define hid_exit PLATFORM_hid_exit
@ -1286,4 +1286,4 @@ int hid_exit(void)
}
#endif /* SDL_DISABLE_HIDAPI */
#endif /* SDL_HIDAPI_DISABLED */

4
src/hidapi/ios/hid.m
View File

@ -20,7 +20,7 @@
*/
#include "../../SDL_internal.h"
#ifndef SDL_DISABLE_HIDAPI
#if !SDL_HIDAPI_DISABLED
#define hid_init PLATFORM_hid_init
#define hid_exit PLATFORM_hid_exit
@ -961,4 +961,4 @@ HID_API_EXPORT const wchar_t* HID_API_CALL hid_error(hid_device *dev)
return NULL;
}
#endif /* !SDL_DISABLE_HIDAPI */
#endif /* !SDL_HIDAPI_DISABLED */