mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2025-02-21 19:11:09 +00:00
pandr reworked marcus's MME Digital UNIX sound support to fit with out changes.
just have to add snd_mme.c next
This commit is contained in:
parent
ea9c2f09b8
commit
60be1a206d
3 changed files with 15 additions and 3 deletions
|
@ -302,17 +302,22 @@ AC_SUBST(INTEL_ARCH)
|
||||||
#
|
#
|
||||||
# Sound available?
|
# Sound available?
|
||||||
#
|
#
|
||||||
|
SND_LIBS=""
|
||||||
AC_MSG_CHECKING(for sound support)
|
AC_MSG_CHECKING(for sound support)
|
||||||
case "${target}" in
|
case "${target}" in
|
||||||
changequote(,)dnl
|
changequote(,)dnl
|
||||||
i[34567]86-*-linux-gnu*)
|
i[34567]86-*-linux-gnu*)
|
||||||
changequote([,])dnl
|
|
||||||
SND_STYLE="Linux" ;;
|
SND_STYLE="Linux" ;;
|
||||||
*-solaris*)
|
*-solaris*)
|
||||||
SND_STYLE="Solaris" ;;
|
SND_STYLE="Solaris" ;;
|
||||||
|
*-dec-osf[34]*)
|
||||||
|
SND_STYLE="MME"
|
||||||
|
SND_LIBS="-lmme"
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
SND_STYLE="Null" ;;
|
SND_STYLE="Null" ;;
|
||||||
# XXX - need to add dos, Windows
|
# XXX - need to add dos, Windows
|
||||||
|
changequote([,])dnl
|
||||||
esac
|
esac
|
||||||
if test "x$SND_STYLE" = xNull; then
|
if test "x$SND_STYLE" = xNull; then
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
|
@ -320,6 +325,7 @@ else
|
||||||
AC_MSG_RESULT(yes ($SND_STYLE style))
|
AC_MSG_RESULT(yes ($SND_STYLE style))
|
||||||
fi
|
fi
|
||||||
AC_SUBST(SND_STYLE)
|
AC_SUBST(SND_STYLE)
|
||||||
|
AC_SUBST(SND_LIBS)
|
||||||
|
|
||||||
##########################################################
|
##########################################################
|
||||||
#
|
#
|
||||||
|
|
|
@ -11,7 +11,7 @@ BIN_PREFIX = qw-client
|
||||||
|
|
||||||
BUILD_DIR = $(PROJECT_DIR)/targets/qw_client
|
BUILD_DIR = $(PROJECT_DIR)/targets/qw_client
|
||||||
|
|
||||||
LDFLAGS = @LDFLAGS@
|
LDFLAGS = @LDFLAGS@ @SND_LIBS@
|
||||||
LIBS = @LIBS@
|
LIBS = @LIBS@
|
||||||
CC = @CC@
|
CC = @CC@
|
||||||
INTEL_ARCH = @INTEL_ARCH@
|
INTEL_ARCH = @INTEL_ARCH@
|
||||||
|
@ -113,6 +113,9 @@ endif
|
||||||
ifeq ($(SND_STYLE),Solaris)
|
ifeq ($(SND_STYLE),Solaris)
|
||||||
SND_SRC = snd_dma.c snd_sun.c
|
SND_SRC = snd_dma.c snd_sun.c
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(SND_STYLE),MME)
|
||||||
|
SND_SRC = snd_dma.c snd_mme.c
|
||||||
|
endif
|
||||||
|
|
||||||
SND_SRC += snd_mem.c snd_mix.c
|
SND_SRC += snd_mem.c snd_mix.c
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ BIN_PREFIX = quake
|
||||||
COMMON_DIR=$(PROJECT_DIR)/common
|
COMMON_DIR=$(PROJECT_DIR)/common
|
||||||
BUILD_DIR = $(PROJECT_DIR)/targets/uquake
|
BUILD_DIR = $(PROJECT_DIR)/targets/uquake
|
||||||
|
|
||||||
LDFLAGS = @LDFLAGS@
|
LDFLAGS = @LDFLAGS@ @SND_LIBS@
|
||||||
LIBS = @LIBS@
|
LIBS = @LIBS@
|
||||||
CC = @CC@
|
CC = @CC@
|
||||||
INTEL_ARCH = @INTEL_ARCH@
|
INTEL_ARCH = @INTEL_ARCH@
|
||||||
|
@ -109,6 +109,9 @@ endif
|
||||||
ifeq ($(SND_STYLE),Solaris)
|
ifeq ($(SND_STYLE),Solaris)
|
||||||
SND_SRC = snd_dma.c snd_sun.c
|
SND_SRC = snd_dma.c snd_sun.c
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(SND_STYLE),MME)
|
||||||
|
SND_SRC = snd_dma.c snd_mme.c
|
||||||
|
endif
|
||||||
|
|
||||||
SND_SRC += snd_mem.c snd_mix.c
|
SND_SRC += snd_mem.c snd_mix.c
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue