From c11599ae1a461c3c38ac7902ed23fd6523c63f58 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 27 May 2001 00:24:43 +0000 Subject: [PATCH] *** empty log message *** --- configure.in | 42 ++++++++++++++++----------------- src/joystick/amigaos/.cvsignore | 6 +++++ src/video/nanox/.cvsignore | 6 +++++ 3 files changed, 33 insertions(+), 21 deletions(-) create mode 100644 src/joystick/amigaos/.cvsignore create mode 100644 src/video/nanox/.cvsignore diff --git a/configure.in b/configure.in index 25b29e2ea..56d73b5b3 100644 --- a/configure.in +++ b/configure.in @@ -244,7 +244,7 @@ CheckOSS() AC_TRY_COMPILE([ #include ],[ - int arg = SNDCTL_DSP_SETFRAGMENT; + int arg = SNDCTL_DSP_SETFRAGMENT; ],[ have_oss=yes ]) @@ -347,20 +347,20 @@ CheckNAS() { AC_ARG_ENABLE(nas, [ --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 - AC_MSG_CHECKING(for NAS audio support) - have_nas=no - if test -r /usr/X11R6/include/audio/audiolib.h ; then - have_nas=yes - fi - AC_MSG_RESULT($have_nas) - if test x$have_nas = xyes; then - CFLAGS="$CFLAGS -DNAS_SUPPORT" - SYSTEM_LIBS="$SYSTEM_LIBS -laudio -lXt" - AUDIO_SUBDIRS="$AUDIO_SUBDIRS nas" - AUDIO_DRIVERS="$AUDIO_DRIVERS nas/libaudio_nas.la" - fi + AC_MSG_CHECKING(for NAS audio support) + have_nas=no + if test -r /usr/X11R6/include/audio/audiolib.h; then + have_nas=yes + fi + AC_MSG_RESULT($have_nas) + if test x$have_nas = xyes; then + CFLAGS="$CFLAGS -DNAS_SUPPORT" + SYSTEM_LIBS="$SYSTEM_LIBS -laudio -lXt" + AUDIO_SUBDIRS="$AUDIO_SUBDIRS nas" + AUDIO_DRIVERS="$AUDIO_DRIVERS nas/libaudio_nas.la" + fi fi } @@ -1270,11 +1270,11 @@ case "$target" in 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.h) - if test x$use_pthreads = xyes -a x$enable_pthread_sem != xyes; then - COPY_ARCH_SRC(src/thread, generic, SDL_syssem.c) - else - COPY_ARCH_SRC(src/thread, linux, SDL_syssem.c) - fi + if test x$use_pthreads = xyes -a x$enable_pthread_sem != xyes; then + COPY_ARCH_SRC(src/thread, generic, SDL_syssem.c) + else + COPY_ARCH_SRC(src/thread, linux, SDL_syssem.c) + fi COPY_ARCH_SRC(src/thread, generic, SDL_syssem_c.h) COPY_ARCH_SRC(src/thread, linux, SDL_syscond.c) COPY_ARCH_SRC(src/thread, generic, SDL_syscond_c.h) @@ -1682,8 +1682,8 @@ case "$target" in AUDIO_SUBDIRS="$AUDIO_SUBDIRS windib" AUDIO_DRIVERS="$AUDIO_DRIVERS windib/libaudio_windib.la" if test x$use_directx = xyes; then - AUDIO_SUBDIRS="$AUDIO_SUBDIRS windx5" - AUDIO_DRIVERS="$AUDIO_DRIVERS windx5/libaudio_windx5.la" + AUDIO_SUBDIRS="$AUDIO_SUBDIRS windx5" + AUDIO_DRIVERS="$AUDIO_DRIVERS windx5/libaudio_windx5.la" fi fi # Set up files for the joystick library diff --git a/src/joystick/amigaos/.cvsignore b/src/joystick/amigaos/.cvsignore new file mode 100644 index 000000000..899d53557 --- /dev/null +++ b/src/joystick/amigaos/.cvsignore @@ -0,0 +1,6 @@ +Makefile.in +Makefile +.libs +*.o +*.lo +*.la diff --git a/src/video/nanox/.cvsignore b/src/video/nanox/.cvsignore new file mode 100644 index 000000000..899d53557 --- /dev/null +++ b/src/video/nanox/.cvsignore @@ -0,0 +1,6 @@ +Makefile.in +Makefile +.libs +*.o +*.lo +*.la