Configure fixes from Wilbern Cobb for FreeBSD joystick support.
authorSam Lantinga <slouken@libsdl.org>
Thu, 18 Apr 2002 04:28:58 +0000
changeset 3608c1f8c4d2dd1
parent 359 f0e5198a1522
child 361 87624d1308f5
Configure fixes from Wilbern Cobb for FreeBSD joystick support.
configure.in
     1.1 --- a/configure.in	Wed Apr 17 14:25:23 2002 +0000
     1.2 +++ b/configure.in	Thu Apr 18 04:28:58 2002 +0000
     1.3 @@ -292,19 +292,6 @@
     1.4      fi
     1.5  }
     1.6  
     1.7 -dnl Check whether we want to use OpenBSD native audio or not
     1.8 -CheckOPENBSDAUDIO()
     1.9 -{
    1.10 -    AC_ARG_ENABLE(openbsdaudio,
    1.11 -[  --enable-openbsdaudio   OpenBSD native audio support [default=yes]],
    1.12 -                  , enable_openbsdaudio=yes)
    1.13 -    if test x$enable_audio = xyes -a x$enable_openbsdaudio = xyes; then
    1.14 -        CFLAGS="$CFLAGS -DOPENBSD_AUDIO_SUPPORT"
    1.15 -        AUDIO_SUBDIRS="$AUDIO_SUBDIRS openbsd"
    1.16 -        AUDIO_DRIVERS="$AUDIO_DRIVERS openbsd/libaudio_openbsd.la"
    1.17 -    fi
    1.18 -}
    1.19 -
    1.20  dnl Check whether we want to use IRIX 6.5+ native audio or not
    1.21  CheckDMEDIA()
    1.22  {
    1.23 @@ -475,6 +462,9 @@
    1.24                win32)
    1.25                    NASMFLAGS="-f win32"
    1.26                    ;;
    1.27 +              openbsd)
    1.28 +                  NASMFLAGS="-f aoutb"
    1.29 +                  ;;
    1.30                *)
    1.31                    NASMFLAGS="-f elf"
    1.32                    ;;
    1.33 @@ -1580,6 +1570,7 @@
    1.34          if test x$enable_joystick = xyes; then
    1.35              JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS bsd"
    1.36              JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS bsd/libjoystick_bsd.la"
    1.37 +            SYSTEM_LIBS="$SYSTEM_LIBS -lusb"
    1.38          fi
    1.39          # Set up files for the cdrom library
    1.40          if test x$enable_cdrom = xyes; then
    1.41 @@ -1632,6 +1623,7 @@
    1.42          if test x$enable_joystick = xyes; then
    1.43              JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS bsd"
    1.44              JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS bsd/libjoystick_bsd.la"
    1.45 +            SYSTEM_LIBS="$SYSTEM_LIBS -lusb"
    1.46          fi
    1.47          # Set up files for the cdrom library
    1.48          if test x$enable_cdrom = xyes; then
    1.49 @@ -1665,7 +1657,6 @@
    1.50          CheckDummyVideo
    1.51          CheckDiskAudio
    1.52  	CheckDLOPEN
    1.53 -        CheckOPENBSDAUDIO
    1.54          CheckNASM
    1.55          CheckOSS
    1.56          CheckARTSC
    1.57 @@ -1678,12 +1669,11 @@
    1.58          # Set up files for the main() stub
    1.59          COPY_ARCH_SRC(src/main, linux, SDL_main.c)
    1.60          # Set up files for the audio library
    1.61 -        # We use the OSS and native API's, not the Sun audio API
    1.62 -        #if test x$enable_audio = xyes; then
    1.63 -        #    CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
    1.64 -        #    AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
    1.65 -        #    AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
    1.66 -        #fi
    1.67 +        if test x$enable_audio = xyes; then
    1.68 +            CFLAGS="$CFLAGS -DOPENBSD_AUDIO_SUPPORT"
    1.69 +            AUDIO_SUBDIRS="$AUDIO_SUBDIRS openbsd"
    1.70 +            AUDIO_DRIVERS="$AUDIO_DRIVERS openbsd/libaudio_openbsd.la"
    1.71 +        fi
    1.72          # OpenBSD needs linking with ossaudio emulation library
    1.73          if test x$have_oss = xyes; then
    1.74              SYSTEM_LIBS="$SYSTEM_LIBS -lossaudio"
    1.75 @@ -1692,6 +1682,7 @@
    1.76          if test x$enable_joystick = xyes; then
    1.77              JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS bsd"
    1.78              JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS bsd/libjoystick_bsd.la"
    1.79 +            SYSTEM_LIBS="$SYSTEM_LIBS -lusbhid"
    1.80          fi
    1.81          # Set up files for the cdrom library
    1.82          if test x$enable_cdrom = xyes; then