Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Use SDL_hidapi.c instead of the platform specific hid.c implementatio…
…ns when libusb isn't available
  • Loading branch information
slouken committed Nov 25, 2019
1 parent 494af7a commit de6397c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 22 deletions.
12 changes: 1 addition & 11 deletions configure
Expand Up @@ -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

Expand Down
13 changes: 2 additions & 11 deletions configure.ac
Expand Up @@ -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"
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit de6397c

Please sign in to comment.