From de6397cfff0e87ea9d823730046994a7efe2c8a3 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 25 Nov 2019 15:02:48 -0800 Subject: [PATCH] Use SDL_hidapi.c instead of the platform specific hid.c implementations when libusb isn't available --- configure | 12 +----------- configure.ac | 13 ++----------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/configure b/configure index 2f6779f07..6952795c0 100755 --- a/configure +++ b/configure @@ -24364,17 +24364,7 @@ _ACEOF fi else - case "$host" in - *-*-cygwin* | *-*-mingw32* ) - SOURCES="$SOURCES $srcdir/src/hidapi/windows/hid.c" - ;; - *-*-darwin* ) - SOURCES="$SOURCES $srcdir/src/hidapi/mac/hid.c" - ;; - * ) - SOURCES="$SOURCES $srcdir/src/hidapi/linux/hid.c" - ;; - esac + SOURCES="$SOURCES $srcdir/src/hidapi/SDL_hidapi.c" fi fi diff --git a/configure.ac b/configure.ac index c3a60558c..b2ae68bed 100644 --- a/configure.ac +++ b/configure.ac @@ -3315,6 +3315,7 @@ AS_HELP_STRING([--enable-hidapi], [use HIDAPI for low level joystick drivers [[d AC_DEFINE(SDL_JOYSTICK_HIDAPI, 1, [ ]) EXTRA_CFLAGS="$EXTRA_CFLAGS -I$srcdir/src/hidapi/hidapi" SOURCES="$SOURCES $srcdir/src/joystick/hidapi/*.c" + SOURCES="$SOURCES $srcdir/src/hidapi/SDL_hidapi.c" if test x$have_libusb_h = xyes; then EXTRA_CFLAGS="$EXTRA_CFLAGS $LIBUSB_CFLAGS" @@ -3342,17 +3343,7 @@ AS_HELP_STRING([--enable-hidapi], [use HIDAPI for low level joystick drivers [[d AC_DEFINE_UNQUOTED(SDL_LIBUSB_DYNAMIC, "$libusb_lib", [ ]) fi else - case "$host" in - *-*-cygwin* | *-*-mingw32* ) - SOURCES="$SOURCES $srcdir/src/hidapi/windows/hid.c" - ;; - *-*-darwin* ) - SOURCES="$SOURCES $srcdir/src/hidapi/mac/hid.c" - ;; - * ) - SOURCES="$SOURCES $srcdir/src/hidapi/linux/hid.c" - ;; - esac + SOURCES="$SOURCES $srcdir/src/hidapi/SDL_hidapi.c" fi fi