From 59ea0735f0d60bf399164bc334a077753ba91f47 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Thu, 1 Aug 2019 17:41:40 +0300 Subject: [PATCH] configury: allow libusb-less hidapi for macosx. --- configure | 12 ++++++++++++ configure.ac | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/configure b/configure index 30e1b1079..b0657daee 100755 --- a/configure +++ b/configure @@ -24221,6 +24221,12 @@ fi CFLAGS="$save_CFLAGS" if test x$have_libusb_h = xyes; then hidapi_support=yes + elif test x$onlylibusb = xno; then + case "$host" in + *-*-darwin* ) + hidapi_support=yes + ;; + esac fi fi @@ -24236,6 +24242,12 @@ $as_echo "#define SDL_JOYSTICK_HIDAPI 1" >>confdefs.h if test x$onlylibusb = xyes; then SOURCES="$SOURCES $srcdir/src/hidapi/libusb/hid.c" EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LIBUSB_LIBS" + elif test x$have_libusb_h != xyes ; then + case "$host" in + *-*-darwin* ) + SOURCES="$SOURCES $srcdir/src/hidapi/mac/hid.c" + ;; + esac else if test x$have_loadso != xyes; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You must have SDL_LoadObject() support for dynamic libusb loading" >&5 diff --git a/configure.ac b/configure.ac index 101eb2d18..0d1368456 100644 --- a/configure.ac +++ b/configure.ac @@ -3236,6 +3236,12 @@ AS_HELP_STRING([--enable-hidapi], [use HIDAPI for low level joystick drivers [[d CFLAGS="$save_CFLAGS" if test x$have_libusb_h = xyes; then hidapi_support=yes + elif test x$onlylibusb = xno; then + case "$host" in + *-*-darwin* ) + hidapi_support=yes + ;; + esac fi fi @@ -3249,6 +3255,12 @@ AS_HELP_STRING([--enable-hidapi], [use HIDAPI for low level joystick drivers [[d if test x$onlylibusb = xyes; then SOURCES="$SOURCES $srcdir/src/hidapi/libusb/hid.c" EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LIBUSB_LIBS" + elif test x$have_libusb_h != xyes ; then + case "$host" in + *-*-darwin* ) + SOURCES="$SOURCES $srcdir/src/hidapi/mac/hid.c" + ;; + esac else if test x$have_loadso != xyes; then AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic libusb loading])