Skip to content
This repository has been archived by the owner on Feb 11, 2021. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
IRIX is not supported anymore. :)
  • Loading branch information
slouken committed Feb 28, 2011
1 parent 4f31a12 commit cd0a8ca
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 430 deletions.
97 changes: 2 additions & 95 deletions configure
Expand Up @@ -21628,74 +21628,6 @@ _ACEOF
fi
}

CheckDMEDIA()
{
if test x$enable_audio = xyes; then
{ echo "$as_me:$LINENO: checking for dmedia audio support" >&5
echo $ECHO_N "checking for dmedia audio support... $ECHO_C" >&6; }
have_dmedia=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */

#include <dmedia/audio.h>

int
main ()
{

ALport audio_port;

;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then

have_dmedia=yes

else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5


fi

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $have_dmedia" >&5
echo "${ECHO_T}$have_dmedia" >&6; }
# Set up files for the audio library
if test x$have_dmedia = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_AUDIO_DRIVER_DMEDIA 1
_ACEOF

SOURCES="$SOURCES $srcdir/src/audio/dmedia/*.c"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laudio"
have_audio=yes
fi
fi
}

CheckMME()
{
case $ARCH in
Expand Down Expand Up @@ -22582,10 +22514,6 @@ echo $ECHO_N "checking for NAS audio support... $ECHO_C" >&6; }
NAS_CFLAGS="-I/usr/X11R6/include/"
NAS_LIBS="-L/usr/X11R6/lib -laudio -lXt"


elif test -r /usr/freeware/include/nas/audiolib.h; then
have_nas=yes
NAS_LIBS="-lnas -lXt"
fi

{ echo "$as_me:$LINENO: result: $have_nas" >&5
Expand Down Expand Up @@ -24096,10 +24024,6 @@ fi
x11_lib='libX11.so'
x11ext_lib='libXext.so'
;;
*-*-irix*) # IRIX 6.5 requires that we use /usr/lib32
x11_lib='libX11.so'
x11ext_lib='libXext.so'
;;
*)
x11_lib=`find_lib "libX11.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`
x11ext_lib=`find_lib "libXext.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`
Expand Down Expand Up @@ -25834,10 +25758,6 @@ fi
pthread_cflags="-D_REENTRANT -Kthread"
pthread_lib=""
;;
*-*-irix*)
pthread_cflags="-D_SGI_MP_SOURCE"
pthread_lib="-lpthread"
;;
*-*-aix*)
pthread_cflags="-D_REENTRANT -mthreads"
pthread_lib="-lpthread"
Expand Down Expand Up @@ -28322,7 +28242,7 @@ fi
}

case "$host" in
*-*-linux*|*-*-uclinux*|*-*-gnu*|*-*-k*bsd*-gnu|*-*-bsdi*|*-*-freebsd*|*-*-dragonfly*|*-*-netbsd*|*-*-openbsd*|*-*-sysv5*|*-*-solaris*|*-*-hpux*|*-*-irix*|*-*-aix*|*-*-osf*|*-*-minix*)
*-*-linux*|*-*-uclinux*|*-*-gnu*|*-*-k*bsd*-gnu|*-*-bsdi*|*-*-freebsd*|*-*-dragonfly*|*-*-netbsd*|*-*-openbsd*|*-*-sysv5*|*-*-solaris*|*-*-hpux*|*-*-aix*|*-*-osf*|*-*-minix*)
case "$host" in
*-*-linux*) ARCH=linux ;;
*-*-uclinux*) ARCH=linux ;;
Expand All @@ -28338,7 +28258,6 @@ case "$host" in
*-*-sysv5*) ARCH=sysv5 ;;
*-*-solaris*) ARCH=solaris ;;
*-*-hpux*) ARCH=hpux ;;
*-*-irix*) ARCH=irix ;;
*-*-aix*) ARCH=aix ;;
*-*-osf*) ARCH=osf ;;
*-*-minix*) ARCH=minix ;;
Expand All @@ -28349,7 +28268,6 @@ case "$host" in
CheckDummyAudio
CheckDLOPEN
CheckOSS
CheckDMEDIA
CheckMME
CheckALSA
CheckPulseAudio
Expand Down Expand Up @@ -28437,17 +28355,6 @@ _ACEOF
;;
esac
fi
# Set up files for the thread library
if test x$enable_threads = xyes -a x$use_pthreads != xyes -a x$use_pth != xyes -a x$ARCH = xirix; then
cat >>confdefs.h <<\_ACEOF
#define SDL_THREAD_SPROC 1
_ACEOF

SOURCES="$SOURCES $srcdir/src/thread/irix/*.c"
SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c"
SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
have_threads=yes
fi
# Set up files for the timer library
if test x$enable_timers = xyes; then
cat >>confdefs.h <<\_ACEOF
Expand Down Expand Up @@ -28950,7 +28857,7 @@ SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([^ ]*\\)/\\([^ ]*\\)\\.c,\\
# Set runtime shared library paths as needed

if test "x$enable_rpath" = "xyes"; then
if test $ARCH = bsdi -o $ARCH = freebsd -o $ARCH = irix -o $ARCH = linux -o $ARCH = netbsd; then
if test $ARCH = bsdi -o $ARCH = freebsd -o $ARCH = linux -o $ARCH = netbsd; then
SDL_RLD_FLAGS="-Wl,-rpath,\${libdir}"
fi
if test $ARCH = solaris; then
Expand Down
52 changes: 2 additions & 50 deletions configure.in
Expand Up @@ -758,30 +758,6 @@ AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[de
fi
}

dnl Check whether we want to use IRIX 6.5+ native audio or not
CheckDMEDIA()
{
if test x$enable_audio = xyes; then
AC_MSG_CHECKING(for dmedia audio support)
have_dmedia=no
AC_TRY_COMPILE([
#include <dmedia/audio.h>
],[
ALport audio_port;
],[
have_dmedia=yes
])
AC_MSG_RESULT($have_dmedia)
# Set up files for the audio library
if test x$have_dmedia = xyes; then
AC_DEFINE(SDL_AUDIO_DRIVER_DMEDIA)
SOURCES="$SOURCES $srcdir/src/audio/dmedia/*.c"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laudio"
have_audio=yes
fi
fi
}

dnl Check whether we want to use Tru64 UNIX native audio or not
CheckMME()
{
Expand Down Expand Up @@ -973,12 +949,6 @@ AC_HELP_STRING([--enable-nas], [support the NAS audio API [[default=yes]]]),
NAS_CFLAGS="-I/usr/X11R6/include/"
NAS_LIBS="-L/usr/X11R6/lib -laudio -lXt"

dnl On IRIX, the NAS includes are in a different directory,
dnl and libnas must be explicitly linked in

elif test -r /usr/freeware/include/nas/audiolib.h; then
have_nas=yes
NAS_LIBS="-lnas -lXt"
fi

AC_MSG_RESULT($have_nas)
Expand Down Expand Up @@ -1106,10 +1076,6 @@ AC_HELP_STRING([--enable-x11-shared], [dynamically load X11 support [[default=ma
x11_lib='libX11.so'
x11ext_lib='libXext.so'
;;
*-*-irix*) # IRIX 6.5 requires that we use /usr/lib32
x11_lib='libX11.so'
x11ext_lib='libXext.so'
;;
*)
x11_lib=[`find_lib "libX11.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`]
x11ext_lib=[`find_lib "libXext.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`]
Expand Down Expand Up @@ -1645,10 +1611,6 @@ AC_HELP_STRING([--enable-pthread-sem], [use pthread semaphores [[default=yes]]])
pthread_cflags="-D_REENTRANT -Kthread"
pthread_lib=""
;;
*-*-irix*)
pthread_cflags="-D_SGI_MP_SOURCE"
pthread_lib="-lpthread"
;;
*-*-aix*)
pthread_cflags="-D_REENTRANT -mthreads"
pthread_lib="-lpthread"
Expand Down Expand Up @@ -2024,7 +1986,7 @@ AC_HELP_STRING([--enable-rpath], [use an rpath when linking SDL [[default=yes]]]

dnl Set up the configuration based on the host platform!
case "$host" in
*-*-linux*|*-*-uclinux*|*-*-gnu*|*-*-k*bsd*-gnu|*-*-bsdi*|*-*-freebsd*|*-*-dragonfly*|*-*-netbsd*|*-*-openbsd*|*-*-sysv5*|*-*-solaris*|*-*-hpux*|*-*-irix*|*-*-aix*|*-*-osf*|*-*-minix*)
*-*-linux*|*-*-uclinux*|*-*-gnu*|*-*-k*bsd*-gnu|*-*-bsdi*|*-*-freebsd*|*-*-dragonfly*|*-*-netbsd*|*-*-openbsd*|*-*-sysv5*|*-*-solaris*|*-*-hpux*|*-*-aix*|*-*-osf*|*-*-minix*)
case "$host" in
*-*-linux*) ARCH=linux ;;
*-*-uclinux*) ARCH=linux ;;
Expand All @@ -2040,7 +2002,6 @@ case "$host" in
*-*-sysv5*) ARCH=sysv5 ;;
*-*-solaris*) ARCH=solaris ;;
*-*-hpux*) ARCH=hpux ;;
*-*-irix*) ARCH=irix ;;
*-*-aix*) ARCH=aix ;;
*-*-osf*) ARCH=osf ;;
*-*-minix*) ARCH=minix ;;
Expand All @@ -2051,7 +2012,6 @@ case "$host" in
CheckDummyAudio
CheckDLOPEN
CheckOSS
CheckDMEDIA
CheckMME
CheckALSA
CheckPulseAudio
Expand Down Expand Up @@ -2121,14 +2081,6 @@ case "$host" in
;;
esac
fi
# Set up files for the thread library
if test x$enable_threads = xyes -a x$use_pthreads != xyes -a x$use_pth != xyes -a x$ARCH = xirix; then
AC_DEFINE(SDL_THREAD_SPROC)
SOURCES="$SOURCES $srcdir/src/thread/irix/*.c"
SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c"
SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
have_threads=yes
fi
# Set up files for the timer library
if test x$enable_timers = xyes; then
AC_DEFINE(SDL_TIMER_UNIX)
Expand Down Expand Up @@ -2508,7 +2460,7 @@ SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.
# Set runtime shared library paths as needed

if test "x$enable_rpath" = "xyes"; then
if test $ARCH = bsdi -o $ARCH = freebsd -o $ARCH = irix -o $ARCH = linux -o $ARCH = netbsd; then
if test $ARCH = bsdi -o $ARCH = freebsd -o $ARCH = linux -o $ARCH = netbsd; then
SDL_RLD_FLAGS="-Wl,-rpath,\${libdir}"
fi
if test $ARCH = solaris; then
Expand Down
1 change: 0 additions & 1 deletion include/SDL_config.h.in
Expand Up @@ -197,7 +197,6 @@
#undef SDL_AUDIO_DRIVER_COREAUDIO
#undef SDL_AUDIO_DRIVER_DISK
#undef SDL_AUDIO_DRIVER_DUMMY
#undef SDL_AUDIO_DRIVER_DMEDIA
#undef SDL_AUDIO_DRIVER_DSOUND
#undef SDL_AUDIO_DRIVER_ESD
#undef SDL_AUDIO_DRIVER_ESD_DYNAMIC
Expand Down
4 changes: 0 additions & 4 deletions src/audio/SDL_audio.c
Expand Up @@ -51,7 +51,6 @@ extern AudioBootStrap ALSA_bootstrap;
extern AudioBootStrap PULSEAUDIO_bootstrap;
extern AudioBootStrap QSAAUDIO_bootstrap;
extern AudioBootStrap SUNAUDIO_bootstrap;
extern AudioBootStrap DMEDIA_bootstrap;
extern AudioBootStrap ARTS_bootstrap;
extern AudioBootStrap ESD_bootstrap;
extern AudioBootStrap NAS_bootstrap;
Expand Down Expand Up @@ -93,9 +92,6 @@ static const AudioBootStrap *const bootstrap[] = {
#if SDL_AUDIO_DRIVER_SUNAUDIO
&SUNAUDIO_bootstrap,
#endif
#if SDL_AUDIO_DRIVER_DMEDIA
&DMEDIA_bootstrap,
#endif
#if SDL_AUDIO_DRIVER_ARTS
&ARTS_bootstrap,
#endif
Expand Down

0 comments on commit cd0a8ca

Please sign in to comment.