From: John F. Fay Date: Wed, 28 Sep 2011 01:37:26 +0000 (+0000) Subject: FreeBSD patch per e-mail from John Tsiombikas vintage 9/27/11, 10:37 AM X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=commitdiff_plain;h=83f8a01579c1d6beed4b34b72f34741cea836f26;hp=30676ffebdb06f29140e80516794c4da9bd41ed7;p=freeglut FreeBSD patch per e-mail from John Tsiombikas vintage 9/27/11, 10:37 AM git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@942 7f0cb862-5218-0410-a997-914c9d46530a --- diff --git a/configure.ac b/configure.ac index 6d7ef11..15dc997 100644 --- a/configure.ac +++ b/configure.ac @@ -42,11 +42,15 @@ AC_SUBST([LIBXI]) AC_SUBST([VERSION_INFO]) AC_SUBST([EXPORT_FLAGS]) +AC_CHECK_LIB([usbhid], [hid_init], + [LIBUSBHID=-lusbhid], [LIBUSBHID=]) +AC_SUBST(LIBUSBHID) + # Checks for header files. AC_HEADER_STDC save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $X_CFLAGS" -AC_CHECK_HEADERS([usbhid.h errno.h GL/gl.h GL/glu.h GL/glx.h fcntl.h limits.h sys/ioctl.h sys/param.h sys/time.h]) +AC_CHECK_HEADERS([usbhid.h libusbhid.h errno.h GL/gl.h GL/glu.h GL/glx.h fcntl.h limits.h sys/ioctl.h sys/param.h sys/time.h]) AC_HEADER_TIME AC_CHECK_HEADERS([X11/extensions/xf86vmode.h], [], [], [#include ]) AC_CHECK_HEADERS([X11/extensions/Xrandr.h]) diff --git a/src/Makefile.am b/src/Makefile.am index 7e68570..2fadc83 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -44,7 +44,7 @@ lib@LIBRARY@_la_SOURCES = freeglut_callbacks.c \ # # Additional linker flags # -lib@LIBRARY@_la_LIBADD = $(GL_LIBS) $(X_LIBS) $(LIBM) +lib@LIBRARY@_la_LIBADD = $(GL_LIBS) $(X_LIBS) $(LIBM) $(LIBUSBHID) lib@LIBRARY@_la_LDFLAGS = $(VERSION_INFO) -no-undefined lib@LIBRARY@_la_CFLAGS = $(GL_FLAGS) $(X_CFLAGS) $(EXPORT_FLAGS) lib@LIBRARY@_la_CPPFLAGS= -I$(top_srcdir)/include diff --git a/src/freeglut_joystick.c b/src/freeglut_joystick.c index 91fe226..f48dc3f 100644 --- a/src/freeglut_joystick.c +++ b/src/freeglut_joystick.c @@ -79,11 +79,11 @@ # include # include # endif -# if defined(__FreeBSD__) || defined(__NetBSD__) +# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) /* XXX The below hack is done until freeglut's autoconf is updated. */ # define HAVE_USB_JS 1 -# if defined(__FreeBSD__) +# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) # include # else /* @@ -134,7 +134,7 @@ /* BSD defines from "jsBSD.cxx" around lines 42-270 */ -#if defined(__NetBSD__) || defined(__FreeBSD__) +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) # ifdef HAVE_USB_JS # if defined(__NetBSD__) @@ -145,16 +145,14 @@ # else # include # endif -# elif defined(__FreeBSD__) -# if __FreeBSD_version < 500000 -# include -# else -/* XXX The below hack is done until freeglut's autoconf is updated. */ -# define HAVE_USBHID_H 1 +# elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +# ifdef HAVE_USBHID_H # include +# else +# include # endif # endif -# include +# include # include /* Compatibility with older usb.h revisions */ @@ -407,7 +405,7 @@ struct tagSFG_Joystick #if TARGET_HOST_POSIX_X11 -# if defined(__FreeBSD__) || defined(__NetBSD__) +# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) struct os_specific_s *os; # endif @@ -475,7 +473,7 @@ static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes ) int status; #endif -#if defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) int len; #endif @@ -612,7 +610,7 @@ static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes ) #endif #if TARGET_HOST_POSIX_X11 -# if defined(__FreeBSD__) || defined(__NetBSD__) +# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) if ( joy->os->is_analog ) { int status = read ( joy->os->fd, &joy->os->ajs, sizeof(joy->os->ajs) ); @@ -764,7 +762,7 @@ static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes ) } if ( buttons ) -# if defined( __FreeBSD__ ) || defined( __NetBSD__ ) +# if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ ) *buttons = ( joy->js.b1 ? 1 : 0 ) | ( joy->js.b2 ? 2 : 0 ); /* XXX Should not be here -- BSD is handled earlier */ # else *buttons = joy->js.buttons; @@ -1074,7 +1072,7 @@ static void fghJoystickOpen( SFG_Joystick* joy ) CFTypeRef topLevelElement; #endif #if TARGET_HOST_POSIX_X11 -# if defined( __FreeBSD__ ) || defined( __NetBSD__ ) +# if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ ) char *cp; # endif # ifdef JS_NEW @@ -1310,7 +1308,7 @@ static void fghJoystickOpen( SFG_Joystick* joy ) #endif #if TARGET_HOST_POSIX_X11 -#if defined( __FreeBSD__ ) || defined( __NetBSD__ ) +#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ ) for( i = 0; i < _JS_MAX_AXES; i++ ) joy->os->cache_axes[ i ] = 0.0f; @@ -1576,7 +1574,7 @@ static void fghJoystickInit( int ident ) #endif #if TARGET_HOST_POSIX_X11 -# if defined( __FreeBSD__ ) || defined( __NetBSD__ ) +# if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ ) fgJoystick[ ident ]->id = ident; fgJoystick[ ident ]->error = GL_FALSE; @@ -1645,7 +1643,7 @@ void fgJoystickClose( void ) #endif #if TARGET_HOST_POSIX_X11 -#if defined( __FreeBSD__ ) || defined( __NetBSD__ ) +#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ ) if( fgJoystick[ident]->os ) { if( ! fgJoystick[ ident ]->error )