diff options
Diffstat (limited to 'emulators/fmsx/patches')
-rw-r--r-- | emulators/fmsx/patches/patch-aa | 4 | ||||
-rw-r--r-- | emulators/fmsx/patches/patch-ab | 25 |
2 files changed, 23 insertions, 6 deletions
diff --git a/emulators/fmsx/patches/patch-aa b/emulators/fmsx/patches/patch-aa index 7f4acf63670..6592bf5789e 100644 --- a/emulators/fmsx/patches/patch-aa +++ b/emulators/fmsx/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2001/06/03 17:34:57 kei Exp $ +$NetBSD: patch-aa,v 1.4 2006/01/15 19:32:44 joerg Exp $ --- Makefile.orig Mon May 14 07:38:23 2001 +++ Makefile Sun Jun 3 04:48:12 2001 @@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.3 2001/06/03 17:34:57 kei Exp $ +.if defined(USE_SUN_AUDIO) + ${CC} ${CFLAGS} -o fmsx ${OBJECTS} -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lXext -lX11 +.else -+ ${CC} ${CFLAGS} -o fmsx ${OBJECTS} -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lossaudio -lXext -lX11 ++ ${CC} ${CFLAGS} -o fmsx ${OBJECTS} -Wl,-R${X11BASE}/lib -L${X11BASE}/lib ${LIBOSSAUDIO} -lXext -lX11 +.endif # Clean up. diff --git a/emulators/fmsx/patches/patch-ab b/emulators/fmsx/patches/patch-ab index c030c4e6c35..8914b46b7a6 100644 --- a/emulators/fmsx/patches/patch-ab +++ b/emulators/fmsx/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.3 2001/06/03 17:34:58 kei Exp $ +$NetBSD: patch-ab,v 1.4 2006/01/15 19:32:44 joerg Exp $ ---- SndUnix.c.orig Thu Mar 8 04:15:16 2001 -+++ SndUnix.c Sun Jun 3 10:10:59 2001 +--- SndUnix.c.orig 2001-03-07 19:15:16.000000000 +0000 ++++ SndUnix.c @@ -31,7 +31,9 @@ #include <sys/audioio.h> @@ -12,7 +12,24 @@ $NetBSD: patch-ab,v 1.3 2001/06/03 17:34:58 kei Exp $ #define AUDIO_CONV(A) (ULAW[0xFF&(128+(A))]) -@@ -236,7 +238,7 @@ +@@ -73,15 +75,11 @@ static unsigned char ULAW[256] = + + #else /* SUN_AUDIO */ + +-#ifdef __FreeBSD__ +-#include <machine/soundcard.h> +-#endif +- + #ifdef __NetBSD__ + #include <soundcard.h> + #endif + +-#ifdef __linux__ ++#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__linux__) + #include <sys/soundcard.h> + #endif + +@@ -236,7 +234,7 @@ static void SoundSignal(int SIG) case SIGUSR1: /* Suspend execution, until SIGUSR2 catched */ #ifndef SUN_AUDIO |