fixed: FreeBSD build was broken due to joystick code

CMakeLists.txt

@@ -276,6 +276,13 @@ IF(UNIX AND NOT(ANDROID OR BLACKBERRY OR FREEGLUT_WAYLAND))
     ENDIF()
 ENDIF()
 
+# FreeBSD and NetBSD joystick code uses libusbhid
+IF(CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL NetBSD)
+    IF(HAVE_USBHID_H)
+        LIST(APPEND LIBS "-lusbhid")
+    ENDIF()
+ENDIF()
+
 # For OpenGL ES (GLES): compile with -DFREEGLUT_GLES to cleanly
 # bootstrap headers inclusion in freeglut_std.h; this constant also
 # need to be defined in client applications (e.g. through pkg-config),

altbuild/Makefile

@@ -30,8 +30,8 @@ x11obj = src/x11/fg_state_x11_glx.o src/x11/fg_glutfont_definitions_x11.o \
 obj = $(coreobj) $(x11obj)
 
 liba = libglut.a
-incpath = -I. -Isrc -Iinclude -I/usr/X11R6/include
-libpath = -L/usr/X11R6/lib
+incpath = -I. -Isrc -Iinclude -I/usr/local/include -I/usr/X11R6/include
+libpath = -L/usr/local/lib -L/usr/X11R6/lib
 
 CFLAGS = -O2 $(incpath) -DHAVE_CONFIG_H
 LDFLAGS = $(libpath)

src/fg_internal.h

@@ -1063,10 +1063,11 @@ SFG_Menu*   fgCreateMenu( FGCBMenuUC menuCallback, FGCBUserData userData );
 void        fgDestroyMenu( SFG_Menu* menu );
 
 /* Joystick device management functions, defined in fg_joystick.c */
-int         fgJoystickDetect( void );
-void        fgInitialiseJoysticks( void );
-void        fgJoystickClose( void );
-void        fgJoystickPollWindow( SFG_Window* window );
+int fgJoystickDetect(void);
+void fgInitialiseJoysticks(void);
+void fgJoystickClose(void);
+void fgJoystickPollWindow(SFG_Window *window);
+void fgJoystickRawRead(SFG_Joystick *joy, int *buttons, float *axes);
 
 /* InputDevice Initialisation and Closure */
 int         fgInputDeviceDetect( void );

src/fg_joystick.c

@@ -76,7 +76,7 @@ SFG_Joystick *fgJoystick [ MAX_NUM_JOYSTICKS ];
 /*
  * Read the raw joystick data
  */
-static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
+void fgJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
 {
     int i;
 
@@ -151,7 +151,7 @@ static void fghJoystickRead( SFG_Joystick* joy, int* buttons, float* axes )
                 axes[ i ] = 0.0f;
     }
 
-    fghJoystickRawRead( joy, buttons, raw_axes );
+    fgJoystickRawRead( joy, buttons, raw_axes );
 
     if( axes )
         for( i=0; i<joy->num_axes; i++ )

src/x11/fg_joystick_x11.c

@@ -60,7 +60,12 @@
 #            else
 #                include <libusbhid.h>
 #            endif
+#if __FreeBSD_version < 800061
 #            include <legacy/dev/usb/usb.h>
+#else
+#            include <dev/usb/usb_ioctl.h>
+#            include <dev/usb/usb.h>
+#endif
 #        endif
 #        include <dev/usb/usbhid.h>
 
@@ -115,6 +120,7 @@ static int hatmap_y[9] = {0, 1, 1, 0, -1, -1, -1, 0, 1};
 */
 static char *fghJoystickWalkUSBdev(int f, char *dev, char *out, int outlen)
 {
+#if __FreeBSD_version < 800061
     struct usb_device_info di;
     int i, a;
     char *cp;
@@ -136,6 +142,7 @@ static char *fghJoystickWalkUSBdev(int f, char *dev, char *out, int outlen)
                 return out;
             }
     }
+#endif
     return NULL;
 }
 
@@ -500,7 +507,7 @@ void fgPlatformJoystickOpen( SFG_Joystick* joy )
         joy->num_axes    =  2;
         joy->num_buttons = 32;
 
-        fghJoystickRawRead( joy, buttons, axes );
+        fgJoystickRawRead( joy, buttons, axes );
         joy->error = axes[ 0 ] < -1000000000.0f;
         if( joy->error )
             return;