diff options
| author | Brian Feldman <green@FreeBSD.org> | 2002-09-20 19:17:02 +0000 |
|---|---|---|
| committer | Brian Feldman <green@FreeBSD.org> | 2002-09-20 19:17:02 +0000 |
| commit | 3aa1a8aa1000735476c495ae748fb3859808f795 (patch) | |
| tree | a16cf2ff17f504f1018917b32d9874fe156aea0d /emulators/snes9x | |
| parent | Fix build on -CURRENT. (diff) | |
Use sys/soundcard.h instead of machine/soundcard.h
Diffstat (limited to 'emulators/snes9x')
| -rw-r--r-- | emulators/snes9x/files/patch-af | 59 |
1 files changed, 30 insertions, 29 deletions
diff --git a/emulators/snes9x/files/patch-af b/emulators/snes9x/files/patch-af index aeb22b2473f9..3b4bb724326c 100644 --- a/emulators/snes9x/files/patch-af +++ b/emulators/snes9x/files/patch-af @@ -1,5 +1,5 @@ ---- unix/unix.cpp.orig Wed Jan 10 15:40:14 2001 -+++ unix/unix.cpp Tue Feb 6 01:14:53 2001 +--- unix/unix.cpp.orig Wed Feb 28 16:12:23 2001 ++++ unix/unix.cpp Fri Sep 20 14:58:01 2002 @@ -51,9 +51,11 @@ #include <ctype.h> @@ -17,8 +17,9 @@ pthread_mutex_t mutex; #endif +-#ifdef __linux +#ifndef __sun - #ifdef __linux ++#if defined(__linux) || defined(__FreeBSD__) #include <sys/soundcard.h> +#else +#include <machine/soundcard.h> @@ -113,7 +114,7 @@ void InitJoysticks (); void ReadJoysticks (); #endif -@@ -169,7 +240,7 @@ +@@ -168,7 +239,7 @@ char *rom_filename = NULL; char *snapshot_filename = NULL; @@ -122,7 +123,7 @@ static void sigbrkhandler(int) { #ifdef DEBUGGER -@@ -196,91 +267,43 @@ +@@ -195,91 +266,43 @@ if (strcmp (argv [i], "-j") == 0 || strcasecmp (argv [i], "-nojoy") == 0) Settings.JoystickEnabled = FALSE; @@ -155,23 +156,9 @@ - if ((t = atoi (argv [++i])) < 15) js_map_button [0][t] = SNES_START_MASK; - if ((t = atoi (argv [++i])) < 15) js_map_button [0][t] = SNES_SELECT_MASK; - } -+#ifdef __FreeBSD__ -+ else if (strcasecmp(argv[i], "-joyshift") == 0) -+ JoystickShift = 1; -+#endif -+ else if (strncasecmp(argv[i], "-joydev", sizeof("-joydev") - 1) == 0) { -+ char *end, *snum = argv[i] + sizeof("-joydev") - 1; -+ unsigned long num; -+ -+ if (*snum == '\0' || argc < i + 1) -+ S9xUsage(); -+ if ((num = strtoul(snum, &end, 10)) < JOYSTICK_MAX_DEVICES && -+ num > 0 && *end == '\0') -+ js_device[num - 1] = argv[++i]; - else +- else - S9xUsage (); -+ S9xUsage(); - } +- } - else if (strcasecmp (argv [i], "-joymap2") == 0) - { - if (i + 8 < argc) @@ -205,9 +192,23 @@ - if ((t = atoi (argv [++i])) < 15) js_map_button [2][t] = SNES_START_MASK; - if ((t = atoi (argv [++i])) < 15) js_map_button [2][t] = SNES_SELECT_MASK; - } -- else ++#ifdef __FreeBSD__ ++ else if (strcasecmp(argv[i], "-joyshift") == 0) ++ JoystickShift = 1; ++#endif ++ else if (strncasecmp(argv[i], "-joydev", sizeof("-joydev") - 1) == 0) { ++ char *end, *snum = argv[i] + sizeof("-joydev") - 1; ++ unsigned long num; ++ ++ if (*snum == '\0' || argc < i + 1) ++ S9xUsage(); ++ if ((num = strtoul(snum, &end, 10)) < JOYSTICK_MAX_DEVICES && ++ num > 0 && *end == '\0') ++ js_device[num - 1] = argv[++i]; + else - S9xUsage (); -- } ++ S9xUsage(); + } - else if (strcasecmp (argv [i], "-joymap4") == 0) - { - if (i + 8 < argc) @@ -249,7 +250,7 @@ } else #endif -@@ -419,7 +442,7 @@ +@@ -418,7 +441,7 @@ #if !defined(__MSDOS) && defined(DEBUGGER) #if defined(__unix) && !defined(__NeXT__) struct sigaction sa; @@ -258,7 +259,7 @@ sa.sa_handler = sigbrkhandler; #else sa.sa_handler = (SIG_PF) sigbrkhandler; -@@ -611,6 +634,7 @@ +@@ -610,6 +633,7 @@ } #ifdef JOYSTICK_SUPPORT @@ -266,7 +267,7 @@ void InitJoysticks () { #ifdef JSIOCGVERSION -@@ -731,6 +755,184 @@ +@@ -730,6 +754,184 @@ } #endif } @@ -451,7 +452,7 @@ #endif // defined (JOYSTICK_SUPPORT) const char *GetHomeDirectory () -@@ -1423,7 +1625,7 @@ +@@ -1422,7 +1624,7 @@ } #endif @@ -460,7 +461,7 @@ static int Rates[8] = { 0, 8192, 11025, 16500, 22050, 29300, 36600, 44000 -@@ -1542,7 +1744,7 @@ +@@ -1541,7 +1743,7 @@ } #endif @@ -469,7 +470,7 @@ void S9xUnixProcessSound (void) { } -@@ -1641,7 +1843,7 @@ +@@ -1640,7 +1842,7 @@ void *S9xProcessSound (void *) { |