Fix build on -current (machine/soundcard.h -> sys/soundcard.h) and

respect CC and CFLAGS
This commit is contained in:
Kris Kennaway 2002-10-24 03:19:35 +00:00
parent 609c07c0ac
commit df12c3eed0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=68698
2 changed files with 46 additions and 0 deletions

View file

@ -0,0 +1,11 @@
--- snd_unix.c.orig Wed Oct 23 20:11:53 2002
+++ snd_unix.c Wed Oct 23 20:12:07 2002
@@ -23,7 +23,7 @@
#endif
#ifdef SYSTEM_FREEBSD
-#include <machine/soundcard.h>
+#include <sys/soundcard.h>
#define SOUND_DEVICE "/dev/dsp"
#endif

View file

@ -0,0 +1,35 @@
--- Makefile.orig Tue Mar 27 16:51:41 2001
+++ Makefile Wed Oct 23 20:19:27 2002
@@ -18,7 +18,7 @@
DEBUG=-g
-OPTFLAGS=-O2 -fomit-frame-pointer
+OPTFLAGS=
BASE_CFLAGS=-Wall $(DEBUG) $(OPTFLAGS) $(C_ONLY) $(BYTE_ORDER) $(MACH_TYPES)
BASE_SFLAGS=-Wall $(DEBUG) $(OPTFLAGS)
@@ -85,15 +85,14 @@
#
# fixup command variables
#
-LOCAL_CC?=gcc
-LOCAL_CXX?=g++
-LOCAL_AS?=gcc
-LOCAL_LD?=gcc
-
-CC=$(LOCAL_CC)
-CXX=$(LOCAL_CC)
-AS=$(LOCAL_AS)
-LD=$(LOCAL_LD)
+CC?=cc
+LOCAL_CC=$(CC)
+CXX?=c++
+LOCAL_CXX=$(CXX)
+AS=$(CC)
+LOCAL_AS=$(AS)
+LD=$(CC)
+LOCAL_LD=$(LD)
ifndef CROSS_COMPILING
TARGET_CC=$(LOCAL_CC)