joel16/SDL2
1
0
Fork 0
mirror of https://github.com/joel16/SDL2.git synced 2024-12-03 16:50:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40404
This commit is contained in:
Sam Lantinga 2002-06-11 19:56:41 +00:00
parent 2d3904c3e4
commit 05049da4bb
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.in
View File

@ -1545,9 +1545,13 @@ CheckUSBHID()
SYSTEM_LIBS="$SYSTEM_LIBS -lusb" SYSTEM_LIBS="$SYSTEM_LIBS -lusb"
fi fi
AC_CHECK_HEADER(usb.h, have_usb_h=yes)
AC_CHECK_HEADER(usbhid.h, have_usbhid_h=yes) AC_CHECK_HEADER(usbhid.h, have_usbhid_h=yes)
AC_CHECK_HEADER(libusb.h, have_libusb_h=yes) AC_CHECK_HEADER(libusb.h, have_libusb_h=yes)
AC_CHECK_HEADER(libusbhid.h, have_libusbhid_h=yes) AC_CHECK_HEADER(libusbhid.h, have_libusbhid_h=yes)
if test x$have_usb_h = xyes; then
CFLAGS="$CFLAGS -DHAVE_USB_H"
fi
if test x$have_usbhid_h = xyes; then if test x$have_usbhid_h = xyes; then
CFLAGS="$CFLAGS -DHAVE_USBHID_H" CFLAGS="$CFLAGS -DHAVE_USBHID_H"
fi fi
@ -1561,6 +1565,9 @@ CheckUSBHID()
AC_MSG_CHECKING(for usbhid) AC_MSG_CHECKING(for usbhid)
have_usbhid=no have_usbhid=no
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#if defined(HAVE_USB_H)
#include <usb.h>
#endif
#include <dev/usb/usb.h> #include <dev/usb/usb.h>
#include <dev/usb/usbhid.h> #include <dev/usb/usbhid.h>
#if defined(HAVE_USBHID_H) #if defined(HAVE_USBHID_H)
@ -1569,7 +1576,6 @@ CheckUSBHID()
#include <libusb.h> #include <libusb.h>
#elif defined(HAVE_LIBUSBHID_H) #elif defined(HAVE_LIBUSBHID_H)
#include <libusbhid.h> #include <libusbhid.h>
#endif
],[ ],[
struct report_desc *repdesc; struct report_desc *repdesc;
struct usb_ctl_report *repbuf; struct usb_ctl_report *repbuf;

3
src/joystick/bsd/SDL_sysjoystick.c
View File

@ -39,6 +39,9 @@ static char rcsid =
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#if defined(HAVE_USB_H)
#include <usb.h>
#endif
#include <dev/usb/usb.h> #include <dev/usb/usb.h>
#include <dev/usb/usbhid.h> #include <dev/usb/usbhid.h>