Commit 56c5f79a authored by Sam Lantinga's avatar Sam Lantinga

*** empty log message ***

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%4042
parent c8367275
...@@ -244,7 +244,7 @@ CheckOSS() ...@@ -244,7 +244,7 @@ CheckOSS()
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#include <sys/soundcard.h> #include <sys/soundcard.h>
],[ ],[
int arg = SNDCTL_DSP_SETFRAGMENT; int arg = SNDCTL_DSP_SETFRAGMENT;
],[ ],[
have_oss=yes have_oss=yes
]) ])
...@@ -347,20 +347,20 @@ CheckNAS() ...@@ -347,20 +347,20 @@ CheckNAS()
{ {
AC_ARG_ENABLE(nas, AC_ARG_ENABLE(nas,
[ --enable-nas support the NAS audio API [default=yes]], [ --enable-nas support the NAS audio API [default=yes]],
, enable_nas=yes) , enable_nas=yes)
if test x$enable_audio = xyes -a x$enable_nas = xyes; then if test x$enable_audio = xyes -a x$enable_nas = xyes; then
AC_MSG_CHECKING(for NAS audio support) AC_MSG_CHECKING(for NAS audio support)
have_nas=no have_nas=no
if test -r /usr/X11R6/include/audio/audiolib.h ; then if test -r /usr/X11R6/include/audio/audiolib.h; then
have_nas=yes have_nas=yes
fi fi
AC_MSG_RESULT($have_nas) AC_MSG_RESULT($have_nas)
if test x$have_nas = xyes; then if test x$have_nas = xyes; then
CFLAGS="$CFLAGS -DNAS_SUPPORT" CFLAGS="$CFLAGS -DNAS_SUPPORT"
SYSTEM_LIBS="$SYSTEM_LIBS -laudio -lXt" SYSTEM_LIBS="$SYSTEM_LIBS -laudio -lXt"
AUDIO_SUBDIRS="$AUDIO_SUBDIRS nas" AUDIO_SUBDIRS="$AUDIO_SUBDIRS nas"
AUDIO_DRIVERS="$AUDIO_DRIVERS nas/libaudio_nas.la" AUDIO_DRIVERS="$AUDIO_DRIVERS nas/libaudio_nas.la"
fi fi
fi fi
} }
...@@ -1270,11 +1270,11 @@ case "$target" in ...@@ -1270,11 +1270,11 @@ case "$target" in
COPY_ARCH_SRC(src/thread, linux, SDL_systhread_c.h) COPY_ARCH_SRC(src/thread, linux, SDL_systhread_c.h)
COPY_ARCH_SRC(src/thread, linux, SDL_sysmutex.c) COPY_ARCH_SRC(src/thread, linux, SDL_sysmutex.c)
COPY_ARCH_SRC(src/thread, linux, SDL_sysmutex_c.h) COPY_ARCH_SRC(src/thread, linux, SDL_sysmutex_c.h)
if test x$use_pthreads = xyes -a x$enable_pthread_sem != xyes; then if test x$use_pthreads = xyes -a x$enable_pthread_sem != xyes; then
COPY_ARCH_SRC(src/thread, generic, SDL_syssem.c) COPY_ARCH_SRC(src/thread, generic, SDL_syssem.c)
else else
COPY_ARCH_SRC(src/thread, linux, SDL_syssem.c) COPY_ARCH_SRC(src/thread, linux, SDL_syssem.c)
fi fi
COPY_ARCH_SRC(src/thread, generic, SDL_syssem_c.h) COPY_ARCH_SRC(src/thread, generic, SDL_syssem_c.h)
COPY_ARCH_SRC(src/thread, linux, SDL_syscond.c) COPY_ARCH_SRC(src/thread, linux, SDL_syscond.c)
COPY_ARCH_SRC(src/thread, generic, SDL_syscond_c.h) COPY_ARCH_SRC(src/thread, generic, SDL_syscond_c.h)
...@@ -1682,8 +1682,8 @@ case "$target" in ...@@ -1682,8 +1682,8 @@ case "$target" in
AUDIO_SUBDIRS="$AUDIO_SUBDIRS windib" AUDIO_SUBDIRS="$AUDIO_SUBDIRS windib"
AUDIO_DRIVERS="$AUDIO_DRIVERS windib/libaudio_windib.la" AUDIO_DRIVERS="$AUDIO_DRIVERS windib/libaudio_windib.la"
if test x$use_directx = xyes; then if test x$use_directx = xyes; then
AUDIO_SUBDIRS="$AUDIO_SUBDIRS windx5" AUDIO_SUBDIRS="$AUDIO_SUBDIRS windx5"
AUDIO_DRIVERS="$AUDIO_DRIVERS windx5/libaudio_windx5.la" AUDIO_DRIVERS="$AUDIO_DRIVERS windx5/libaudio_windx5.la"
fi fi
fi fi
# Set up files for the joystick library # Set up files for the joystick library
......
Makefile.in
Makefile
.libs
*.o
*.lo
*.la
Makefile.in
Makefile
.libs
*.o
*.lo
*.la
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment