diff options
| author | imp <imp@FreeBSD.org> | 2010-02-04 07:08:06 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2010-02-04 07:08:06 +0000 |
| commit | 205d2929b809896d8d5011c890ad2d50cdca3455 (patch) | |
| tree | 8c220ac0f191a76d52751fbcd14f64225bde15cb /games | |
| parent | 655cacab1fcc9e1c8e843974bd12f10a3310693e (diff) | |
| download | FreeBSD-src-205d2929b809896d8d5011c890ad2d50cdca3455.zip FreeBSD-src-205d2929b809896d8d5011c890ad2d50cdca3455.tar.gz | |
Always compile in the speaker code. There's little savings by
omitting it, and other platforms may implement /dev/speaker in the
future.
Diffstat (limited to 'games')
| -rw-r--r-- | games/morse/Makefile | 4 | ||||
| -rw-r--r-- | games/morse/morse.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/games/morse/Makefile b/games/morse/Makefile index 92d1121..4435422 100644 --- a/games/morse/Makefile +++ b/games/morse/Makefile @@ -4,8 +4,4 @@ PROG= morse MAN= morse.6 -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" -CFLAGS += -DSPEAKER=\"/dev/speaker\" -.endif - .include <bsd.prog.mk> diff --git a/games/morse/morse.c b/games/morse/morse.c index 7663402..45c64b8 100644 --- a/games/morse/morse.c +++ b/games/morse/morse.c @@ -63,6 +63,9 @@ static const char rcsid[] = #include <termios.h> #include <unistd.h> +/* Always use the speaker, let the open fail if -p is selected */ +#define SPEAKER "/dev/speaker" + #ifdef SPEAKER #include <dev/speaker/speaker.h> #endif |
