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

respect CC and CFLAGS

2 files changed, 46 insertions, 0 deletions

diff --git a/emulators/darcnes/files/patch-aa b/emulators/darcnes/files/patch-aa
new file mode 100644
index 000000000000..18290f5fc77c
--- /dev/null
+++ b/emulators/darcnes/files/patch-aa
@@ -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
+ 
diff --git a/emulators/darcnes/files/patch-ab b/emulators/darcnes/files/patch-ab
new file mode 100644
index 000000000000..82029382ca30
--- /dev/null
+++ b/emulators/darcnes/files/patch-ab
@@ -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)