pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Configure fixes from Wilbern Cobb for FreeBSD joystick support.

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40361
This commit is contained in:
Sam Lantinga 2002-04-18 04:28:58 +00:00
parent 7db7d624e3
commit 93d5fae904
1 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

31
configure.in
View file

@ -292,19 +292,6 @@ CheckALSA()
fi fi
} }
dnl Check whether we want to use OpenBSD native audio or not
CheckOPENBSDAUDIO()
{
AC_ARG_ENABLE(openbsdaudio,
[ --enable-openbsdaudio OpenBSD native audio support [default=yes]],
, enable_openbsdaudio=yes)
if test x$enable_audio = xyes -a x$enable_openbsdaudio = xyes; then
CFLAGS="$CFLAGS -DOPENBSD_AUDIO_SUPPORT"
AUDIO_SUBDIRS="$AUDIO_SUBDIRS openbsd"
AUDIO_DRIVERS="$AUDIO_DRIVERS openbsd/libaudio_openbsd.la"
fi
}
dnl Check whether we want to use IRIX 6.5+ native audio or not dnl Check whether we want to use IRIX 6.5+ native audio or not
CheckDMEDIA() CheckDMEDIA()
{ {
@ -475,6 +462,9 @@ CheckNASM()
win32) win32)
NASMFLAGS="-f win32" NASMFLAGS="-f win32"
;; ;;
openbsd)
NASMFLAGS="-f aoutb"
;;
*) *)
NASMFLAGS="-f elf" NASMFLAGS="-f elf"
;; ;;
@ -1580,6 +1570,7 @@ case "$target" in
if test x$enable_joystick = xyes; then if test x$enable_joystick = xyes; then
JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS bsd" JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS bsd"
JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS bsd/libjoystick_bsd.la" JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS bsd/libjoystick_bsd.la"
SYSTEM_LIBS="$SYSTEM_LIBS -lusb"
fi fi
# Set up files for the cdrom library # Set up files for the cdrom library
if test x$enable_cdrom = xyes; then if test x$enable_cdrom = xyes; then
@ -1632,6 +1623,7 @@ case "$target" in
if test x$enable_joystick = xyes; then if test x$enable_joystick = xyes; then
JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS bsd" JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS bsd"
JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS bsd/libjoystick_bsd.la" JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS bsd/libjoystick_bsd.la"
SYSTEM_LIBS="$SYSTEM_LIBS -lusb"
fi fi
# Set up files for the cdrom library # Set up files for the cdrom library
if test x$enable_cdrom = xyes; then if test x$enable_cdrom = xyes; then
@ -1665,7 +1657,6 @@ case "$target" in
CheckDummyVideo CheckDummyVideo
CheckDiskAudio CheckDiskAudio
CheckDLOPEN CheckDLOPEN
CheckOPENBSDAUDIO
CheckNASM CheckNASM
CheckOSS CheckOSS
CheckARTSC CheckARTSC
@ -1678,12 +1669,11 @@ case "$target" in
# Set up files for the main() stub # Set up files for the main() stub
COPY_ARCH_SRC(src/main, linux, SDL_main.c) COPY_ARCH_SRC(src/main, linux, SDL_main.c)
# Set up files for the audio library # Set up files for the audio library
# We use the OSS and native API's, not the Sun audio API if test x$enable_audio = xyes; then
#if test x$enable_audio = xyes; then CFLAGS="$CFLAGS -DOPENBSD_AUDIO_SUPPORT"
# CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT" AUDIO_SUBDIRS="$AUDIO_SUBDIRS openbsd"
# AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" AUDIO_DRIVERS="$AUDIO_DRIVERS openbsd/libaudio_openbsd.la"
# AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la" fi
#fi
# OpenBSD needs linking with ossaudio emulation library # OpenBSD needs linking with ossaudio emulation library
if test x$have_oss = xyes; then if test x$have_oss = xyes; then
SYSTEM_LIBS="$SYSTEM_LIBS -lossaudio" SYSTEM_LIBS="$SYSTEM_LIBS -lossaudio"
@ -1692,6 +1682,7 @@ case "$target" in
if test x$enable_joystick = xyes; then if test x$enable_joystick = xyes; then
JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS bsd" JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS bsd"
JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS bsd/libjoystick_bsd.la" JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS bsd/libjoystick_bsd.la"
SYSTEM_LIBS="$SYSTEM_LIBS -lusbhid"
fi fi
# Set up files for the cdrom library # Set up files for the cdrom library
if test x$enable_cdrom = xyes; then if test x$enable_cdrom = xyes; then