simplify and remove unneeded stuff
This commit is contained in:
parent
93f1178fa5
commit
601d8cfce3
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-configure,v 1.7 2001/06/23 23:35:09 pvalchev Exp $
|
||||
$OpenBSD: patch-configure,v 1.8 2001/07/03 01:00:14 pvalchev Exp $
|
||||
--- configure.orig Mon Jun 18 09:21:53 2001
|
||||
+++ configure Sat Jun 23 17:28:02 2001
|
||||
+++ configure Mon Jul 2 18:47:29 2001
|
||||
@@ -3318,7 +3318,11 @@ echo "configure:3316: checking for OSS a
|
||||
#line 3319 "configure"
|
||||
#include "confdefs.h"
|
||||
@ -1038,15 +1038,12 @@ $OpenBSD: patch-configure,v 1.7 2001/06/23 23:35:09 pvalchev Exp $
|
||||
rm -rf conftest*
|
||||
|
||||
use_directx=yes
|
||||
@@ -6889,8 +6893,14 @@ __EOF__
|
||||
@@ -6889,8 +6893,10 @@ __EOF__
|
||||
cat >>$new <$old
|
||||
|
||||
fi
|
||||
+ if test x$enable_openbsdaudio = xyes; then
|
||||
# OpenBSD does not define "unix"
|
||||
- # OpenBSD does not define "unix"
|
||||
- CFLAGS="$CFLAGS -Dunix"
|
||||
+ CFLAGS="$CFLAGS -Dunix"
|
||||
+ fi
|
||||
+ # OpenBSD needs linking with ossaudio emulation library
|
||||
+ if test x$enable_oss = xyes; then
|
||||
+ LIBS="$LIBS -lossaudio"
|
||||
@ -1054,7 +1051,7 @@ $OpenBSD: patch-configure,v 1.7 2001/06/23 23:35:09 pvalchev Exp $
|
||||
;;
|
||||
*-*-sysv5*)
|
||||
ARCH=sysv5
|
||||
@@ -8897,7 +8907,7 @@ if test $ARCH = solaris; then
|
||||
@@ -8897,7 +8903,7 @@ if test $ARCH = solaris; then
|
||||
fi
|
||||
|
||||
if test $ARCH = openbsd; then
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-configure_in,v 1.7 2001/06/23 23:35:10 pvalchev Exp $
|
||||
$OpenBSD: patch-configure_in,v 1.8 2001/07/03 01:00:14 pvalchev Exp $
|
||||
--- configure.in.orig Mon Jun 18 09:21:38 2001
|
||||
+++ configure.in Sat Jun 23 17:27:55 2001
|
||||
+++ configure.in Mon Jul 2 18:47:27 2001
|
||||
@@ -246,7 +246,11 @@ CheckOSS()
|
||||
AC_MSG_CHECKING(for OSS audio support)
|
||||
have_oss=no
|
||||
@ -13,15 +13,12 @@ $OpenBSD: patch-configure_in,v 1.7 2001/06/23 23:35:10 pvalchev Exp $
|
||||
],[
|
||||
int arg = SNDCTL_DSP_SETFRAGMENT;
|
||||
],[
|
||||
@@ -1385,8 +1389,14 @@ case "$target" in
|
||||
@@ -1385,8 +1389,10 @@ case "$target" in
|
||||
if test x$enable_timers = xyes; then
|
||||
COPY_ARCH_SRC(src/timer, linux, SDL_systimer.c)
|
||||
fi
|
||||
+ if test x$enable_openbsdaudio = xyes; then
|
||||
# OpenBSD does not define "unix"
|
||||
- # OpenBSD does not define "unix"
|
||||
- CFLAGS="$CFLAGS -Dunix"
|
||||
+ CFLAGS="$CFLAGS -Dunix"
|
||||
+ fi
|
||||
+ # OpenBSD needs linking with ossaudio emulation library
|
||||
+ if test x$enable_oss = xyes; then
|
||||
+ LIBS="$LIBS -lossaudio"
|
||||
@ -29,7 +26,7 @@ $OpenBSD: patch-configure_in,v 1.7 2001/06/23 23:35:10 pvalchev Exp $
|
||||
;;
|
||||
*-*-sysv5*)
|
||||
ARCH=sysv5
|
||||
@@ -1959,7 +1969,7 @@ if test $ARCH = solaris; then
|
||||
@@ -1959,7 +1965,7 @@ if test $ARCH = solaris; then
|
||||
fi
|
||||
|
||||
if test $ARCH = openbsd; then
|
||||
|
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-src_audio_SDL_audio_c,v 1.3 2001/06/23 19:05:37 pvalchev Exp $
|
||||
--- src/audio/SDL_audio.c.orig Fri Jun 15 19:51:42 2001
|
||||
+++ src/audio/SDL_audio.c Fri Jun 22 09:52:25 2001
|
||||
@@ -47,9 +47,6 @@ static AudioBootStrap *bootstrap[] = {
|
||||
#ifdef ALSA_SUPPORT
|
||||
&ALSA_bootstrap,
|
||||
#endif
|
||||
-#ifdef __OpenBSD__
|
||||
- &OBSD_bootstrap,
|
||||
-#endif
|
||||
#if (defined(unix) && !defined(__CYGWIN32__)) && \
|
||||
!defined(OSS_SUPPORT) && !defined(ALSA_SUPPORT)
|
||||
&AUDIO_bootstrap,
|
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-src_audio_SDL_sysaudio_h,v 1.2 2001/06/23 19:05:39 pvalchev Exp $
|
||||
--- src/audio/SDL_sysaudio.h.orig Fri Jun 22 09:53:10 2001
|
||||
+++ src/audio/SDL_sysaudio.h Fri Jun 22 09:53:17 2001
|
||||
@@ -106,9 +106,6 @@ extern AudioBootStrap DMA_bootstrap;
|
||||
#ifdef ALSA_SUPPORT
|
||||
extern AudioBootStrap ALSA_bootstrap;
|
||||
#endif
|
||||
-#ifdef __OpenBSD__
|
||||
-extern AudioBootStrap OBSD_bootstrap;
|
||||
-#endif
|
||||
#if (defined(unix) && !defined(__CYGWIN32__)) && \
|
||||
!defined(OSS_SUPPORT) && !defined(ALSA_SUPPORT)
|
||||
extern AudioBootStrap AUDIO_bootstrap;
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-src_audio_openbsd_SDL_openbsdaudio_c,v 1.1 2001/06/23 19:05:40 pvalchev Exp $
|
||||
--- src/audio/openbsd/SDL_openbsdaudio.c.orig Fri Jun 22 09:54:25 2001
|
||||
+++ src/audio/openbsd/SDL_openbsdaudio.c Fri Jun 22 09:54:42 2001
|
||||
@@ -131,7 +131,7 @@ static SDL_AudioDevice
|
||||
return this;
|
||||
}
|
||||
|
||||
-AudioBootStrap OBSD_bootstrap = {
|
||||
+AudioBootStrap AUDIO_bootstrap = {
|
||||
OBSD_DRIVER_NAME, "Native OpenBSD audio",
|
||||
Audio_Available, Audio_CreateDevice
|
||||
};
|
Loading…
Reference in New Issue
Block a user