diff options
author | Steve Price <steve@FreeBSD.org> | 1999-12-23 18:44:10 +0000 |
---|---|---|
committer | Steve Price <steve@FreeBSD.org> | 1999-12-23 18:44:10 +0000 |
commit | 20fe79de4b699bed34e61ff3232bf0d6aef8c815 (patch) | |
tree | 89f122097cb56723261e7af7dc9d16e0ee8ca499 /audio/maplay/files/patch-ad | |
parent | Update to patchlevel j067.1. (diff) |
* Fixed patches not to change one file twice
* Rearrenged build target
PR: 15378
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Diffstat (limited to 'audio/maplay/files/patch-ad')
-rw-r--r-- | audio/maplay/files/patch-ad | 51 |
1 files changed, 32 insertions, 19 deletions
diff --git a/audio/maplay/files/patch-ad b/audio/maplay/files/patch-ad index bb62d8b11cce..3829d864a091 100644 --- a/audio/maplay/files/patch-ad +++ b/audio/maplay/files/patch-ad @@ -1,19 +1,32 @@ ---- configuration.sh.orig Thu Jun 23 07:14:46 1994 -+++ configuration.sh Thu Nov 25 02:53:40 1999 -@@ -72,6 +72,16 @@ - INCLUDEDIRS= - LIBRARIES= - AUDIO_INCLUDES='#include <sys/audioio.h>' ;; -+ FreeBSD*) -+ COMPILER='${CXX}' -+ if [ `uname -m` = "alpha" ]; then -+ COMPILERFLAGS='-DLINUX' -+ else -+ COMPILERFLAGS='-m486 -DLINUX -DDAMN_INTEL_BYTE_ORDER' -+ fi -+ INCLUDEDIRS= -+ LIBRARIES= -+ AUDIO_INCLUDES='#include <machine/soundcard.h>' ;; - Linux*) - COMPILER=g++ - COMPILERFLAGS='-O2 -m486 -funroll-loops -DLINUX -DDAMN_INTEL_BYTE_ORDER' +*** configuration.sh.orig Thu Jun 23 21:14:46 1994 +--- configuration.sh Thu Dec 9 05:21:02 1999 +*************** +*** 72,77 **** +--- 72,87 ---- + INCLUDEDIRS= + LIBRARIES= + AUDIO_INCLUDES='#include <sys/audioio.h>' ;; ++ FreeBSD*) ++ COMPILER='${CXX}' ++ if [ ${ARCH} = "i386" ]; then ++ COMPILERFLAGS='-m486 -DLINUX -DDAMN_INTEL_BYTE_ORDER' ++ else ++ COMPILERFLAGS='-DLINUX' ++ fi ++ INCLUDEDIRS= ++ LIBRARIES= ++ AUDIO_INCLUDES='#include <machine/soundcard.h>' ;; + Linux*) + COMPILER=g++ + COMPILERFLAGS='-O2 -m486 -funroll-loops -DLINUX -DDAMN_INTEL_BYTE_ORDER' +*************** +*** 95,98 **** + echo $AUDIO_INCLUDES >audio_includes.h + fi + +! make all +--- 105,108 ---- + echo $AUDIO_INCLUDES >audio_includes.h + fi + +! make maplay |