qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-31 13:10:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Do not try to build testsound when not building sound libs.

Browse source
This commit is contained in:
Bill Currie 2011-07-30 15:03:19 +09:00
parent c6e0e094d8
commit 28610c08e3
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config.d/build_control.m4
View file

@ -298,6 +298,7 @@ SND_OUTPUT_DEFAULT=""
if test -n "$CL_TARGETS"; then if test -n "$CL_TARGETS"; then
CD_TARGETS="libQFcd.la" CD_TARGETS="libQFcd.la"
SND_TARGETS="libQFsound.la" SND_TARGETS="libQFsound.la"
AUDIO_TARGETS="testsound"
JOY_TARGETS="libQFjs.la" JOY_TARGETS="libQFjs.la"
if test "`echo $SOUND_TYPES | grep ALSA`"; then if test "`echo $SOUND_TYPES | grep ALSA`"; then
SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS snd_output_alsa.la" SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS snd_output_alsa.la"
@ -364,6 +365,7 @@ else
SND_PLUGIN_TARGETS="" SND_PLUGIN_TARGETS=""
SND_REND_TARGETS="" SND_REND_TARGETS=""
SND_TARGETS="" SND_TARGETS=""
AUDIO_TARGETS=""
unset SOUND_TYPES unset SOUND_TYPES
fi fi
AC_DEFINE_UNQUOTED(SND_OUTPUT_DEFAULT, "$SND_OUTPUT_DEFAULT", [Define this to the default sound output driver.]) AC_DEFINE_UNQUOTED(SND_OUTPUT_DEFAULT, "$SND_OUTPUT_DEFAULT", [Define this to the default sound output driver.])
@ -510,6 +512,7 @@ AC_SUBST(SND_REND_STATIC)
AC_SUBST(SND_REND_STATIC_LIBS) AC_SUBST(SND_REND_STATIC_LIBS)
AC_SUBST(SND_REND_TARGETS) AC_SUBST(SND_REND_TARGETS)
AC_SUBST(SND_TARGETS) AC_SUBST(SND_TARGETS)
AC_SUBST(AUDIO_TARGETS)
AC_SUBST(VID_MODEL_TARGETS) AC_SUBST(VID_MODEL_TARGETS)
AC_SUBST(VID_REND_TARGETS) AC_SUBST(VID_REND_TARGETS)
AC_SUBST(VID_REND_NOINST_TARGETS) AC_SUBST(VID_REND_NOINST_TARGETS)

4
libs/audio/test/Makefile.am
View file

@ -2,7 +2,9 @@ AUTOMAKE_OPTIONS= foreign
INCLUDES= -I$(top_srcdir)/include INCLUDES= -I$(top_srcdir)/include
noinst_PROGRAMS= testsound noinst_PROGRAMS= @AUDIO_TARGETS@
EXTRA_PROGRAMS= testsound
testsound_SOURCES= testsound.c testsound_SOURCES= testsound.c
testsound_LDADD= $(top_builddir)/libs/audio/libQFsound.la $(top_builddir)/libs/util/libQFutil.la testsound_LDADD= $(top_builddir)/libs/audio/libQFsound.la $(top_builddir)/libs/util/libQFutil.la