qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 07:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the broken defaults for sound and cd plugins.

Browse source 
This has the side effect of defining defaults for all plugins, but as only
sound and cd actually use the defaults, no harm done.
This commit is contained in:
Bill Currie 2012-02-12 21:16:10 +09:00
parent e416c3e172
commit a16daac352
4 changed files with 17 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.d/build_control.m4
View file

@ -344,7 +344,6 @@ QF_PROCESS_NEED_LIBS(vid, [asm common gl glsl sdl sw sw32 svga x11])
QF_PROCESS_NEED_LIBS(qw, [client common sdl server], a)
QF_PROCESS_NEED_LIBS(nq, [client common sdl server], a)
SND_OUTPUT_DEFAULT=""
if test -n "$CL_TARGETS"; then
CD_TARGETS="libQFcd.la"
SND_TARGETS="libQFsound.la"
@ -358,7 +357,6 @@ else
SND_TARGETS=""
AUDIO_TARGETS=""
fi
AC_DEFINE_UNQUOTED(SND_OUTPUT_DEFAULT, "$SND_OUTPUT_DEFAULT", [Define this to the default sound output driver.])
if test "x$enable_shared" = xno; then
PREFER_PIC=

39
config.d/cdrom.m4
View file

@ -11,7 +11,7 @@ if test "x$mingw" != xyes -a "x$enable_xmms" == xyes; then
HAVE_XMMS=yes,
HAVE_XMMS=no)
AC_SUBST(HAVE_XMMS)
fi
fi
CDTYPE=""
if test "x$HAVE_VORBIS" = xyes; then
@ -83,39 +83,6 @@ AC_ARG_WITH([cd-default],
AS_HELP_STRING([--with-cd-default=...],
[Plugin to use for the default cd driver.]
[Defaults to File.]
[[File Linux XMMS SDL SGI WIN32]]),
cd_default="$withval", cd_default=File
[[file linux xmms sdl sgi win32]]),
[cd_default="$withval"]
)
CD_DEFAULT=""
if test "x$cd_default" != "x"; then
for cdd in $CDTYPE; do
if test "x$cdd" = "x$cd_default"; then
CD_DEFAULT="$cd_default"
fi
done
fi
case "x$CD_DEFAULT" in
xFile)
CD_DEFAULT=file
;;
xLinux)
CD_DEFAULT=linux
;;
xXMMS)
CD_DEFAULT=xmms
;;
xSDL)
CD_DEFAULT=sdl
;;
xSGI)
CD_DEFAULT=sgi
;;
xWIN32)
CD_DEFAULT=win
;;
x*)
AC_MSG_WARN([Unknown or unbuildable cd plugin])
CD_DEFAULT=file
;;
esac
AC_DEFINE_UNQUOTED(CD_DEFAULT, ["$CD_DEFAULT"], [Define to the default CD plugin])

4
config.d/result.m4
View file

@ -5,8 +5,8 @@ AC_MSG_RESULT([
Server support :${SV_TARGETS:- no}
Client support :${CL_TARGETS:- no}
Tools support :${tools_dirs:- no}
Sound support :${SOUND_TYPES:- no} ${SND_OUTPUT_DEFAULT}
CD Audio system :${CDTYPE:- no} ${CD_DEFAULT}
Sound support :${SOUND_TYPES:- no} ${snd_output_default}
CD Audio system :${CDTYPE:- no} ${cd_default}
IPv6 networking : $NETTYPE_IPV6
Compression support: gz=$HAVE_ZLIB ogg=$HAVE_VORBIS flac=$HAVE_FLAC png=$HAVE_PNG
HTTP support : ${CURL:-no}

19
m4/quakeforge.m4
View file

@ -96,6 +96,13 @@ AC_DEFUN([QF_PROCESS_NEED_subroutine],
fi
])])
AC_DEFUN([QF_PROCESS_NEED_FUNC],
[m4_foreach_w([qfn_need], [$2],
[if test x"${$1[_need_]qfn_need}" = xyes; then
$3
fi
])])
AC_DEFUN([QF_PROCESS_NEED_LIBS],
[m4_define([qfn_ext], m4_default($3,[la]))
QF_PROCESS_NEED_subroutine([lib$1_],[$1],[.]qfn_ext,[$1_libs],[$2])
@ -108,6 +115,11 @@ AC_SUBST([$1_dirs])])
AC_DEFUN([QF_PROCESS_NEED_PLUGINS],
[QF_PROCESS_NEED_subroutine([$1_],[$1],[.la],[$1_plugins],[$2])
AC_SUBST([$1_plugins])
m4_define([qfn_default], m4_default($3,$1)[_default])
if test -z "${qfn_default}"; then
QF_PROCESS_NEED_FUNC([$1],[$2],[qfn_default=qfn_need])
fi
AC_DEFINE_UNQUOTED(m4_toupper(qfn_default), [${qfn_default}], [Define to default the $1 plugin])
AC_DEFINE_UNQUOTED(m4_toupper(m4_default($3,$1)[_plugin_protos]), [], [list of $1 plugin prototypes])
AC_DEFINE_UNQUOTED(m4_toupper(m4_default($3,$1)[_plugin_list]), [], [list of $1 plugins])
])
@ -136,13 +148,6 @@ QF_STATIC_PLUGIN_LIBS(m4_default($4,$1),[$1],[$2],[$3])
QF_STATIC_PLUGIN_PROTOS(m4_default($4,$1),[$1],[$2])
QF_STATIC_PLUGIN_LIST(m4_default($4,$1),[$1],[$2])])
AC_DEFUN([QF_PROCESS_NEED_FUNC],
[m4_foreach_w([qfn_need], [$2],
[if test x"${$1[_need_]qfn_need}" = xyes; then
$3
fi
])])
AC_DEFUN([QF_WITH_TARGETS], [
AC_ARG_WITH($1,
[$2]