diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2002-09-08 01:33:05 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2002-09-08 01:33:05 +0000 |
| commit | bf4eb9dd7086c44cc9a9296c60d048a5473e9422 (patch) | |
| tree | ef23959c990fa2acc2ee40eecaa6cfc87a966386 /games/rocksndiamonds | |
| parent | Fix build on -current (machine/soundcard.h -> sys/soundcard.h, and (diff) | |
Fix build in -current (machine/soundcard.h -> sys/soundcard.h) and respect
CC
Notes
Notes:
svn path=/head/; revision=65815
Diffstat (limited to 'games/rocksndiamonds')
| -rw-r--r-- | games/rocksndiamonds/files/patch-aa | 15 | ||||
| -rw-r--r-- | games/rocksndiamonds/files/patch-ad | 14 |
2 files changed, 18 insertions, 11 deletions
diff --git a/games/rocksndiamonds/files/patch-aa b/games/rocksndiamonds/files/patch-aa index ccd82db81b76..e5ca2a64d7c5 100644 --- a/games/rocksndiamonds/files/patch-aa +++ b/games/rocksndiamonds/files/patch-aa @@ -1,6 +1,11 @@ ---- Makefile.orig Wed Oct 27 02:07:38 1999 -+++ Makefile Wed Jan 5 22:29:39 2000 -@@ -18,7 +18,7 @@ +--- Makefile.orig Mon Mar 18 17:44:18 2002 ++++ Makefile Sat Sep 7 17:32:58 2002 +@@ -8,11 +8,11 @@ + #-----------------------------------------------------------------------------# + + # specify your favorite ANSI C compiler +-CC = gcc ++CC ?= cc # specify path to X11 on your system # if undefined, use system defaults (works with Linux/gcc/libc5) @@ -9,7 +14,7 @@ # specify directory for read-only game data (like graphics, sounds, levels) # default is '.', so you can play without installing game data somewhere -@@ -46,8 +46,6 @@ +@@ -41,8 +41,6 @@ #-----------------------------------------------------------------------------# .EXPORT_ALL_VARIABLES: @@ -17,4 +22,4 @@ -MAKE = make SRC_DIR = src - MAKE_CMD = @$(MAKE) -C $(SRC_DIR) + MAKE_CMD = $(MAKE) -C $(SRC_DIR) diff --git a/games/rocksndiamonds/files/patch-ad b/games/rocksndiamonds/files/patch-ad index 8670ea37470a..ce8ea574a36d 100644 --- a/games/rocksndiamonds/files/patch-ad +++ b/games/rocksndiamonds/files/patch-ad @@ -1,11 +1,13 @@ ---- src/libgame/sound.h.orig Sat Dec 16 23:07:58 2000 -+++ src/libgame/sound.h Tue Jan 30 09:48:31 2001 -@@ -24,7 +24,7 @@ +--- ./src/libgame/sound.h.orig Fri Mar 15 11:07:46 2002 ++++ ./src/libgame/sound.h Sat Sep 7 17:31:52 2002 +@@ -24,8 +24,8 @@ #if defined(PLATFORM_LINUX) #include <linux/soundcard.h> -#elif defined(PLATFORM_FREEBSD) +-#include <machine/soundcard.h> +#elif defined(PLATFORM_FREEBSD) && !defined(NO_SOUNDS) - #include <machine/soundcard.h> - #elif defined(PLATFORM_HPUX) - #include <sys/audio.h> ++#include <sys/soundcard.h> + #elif defined(PLATFORM_NETBSD) + #include <sys/ioctl.h> + #include <sys/audioio.h> |