configury: allow libusb-less hidapi for macosx.

libsdl-org · Aug 1, 2019 · 59ea073 · 59ea073
1 parent c37c6cb
commit 59ea073
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git 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
@@ -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])