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

[audio] Get testsound working again

Browse source
This commit is contained in:
Bill Currie 2021-06-21 16:40:40 +09:00
parent 12ab283c22
commit 770187372d
5 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config.d/build_control.m4
View file

@ -354,7 +354,7 @@ QF_PROCESS_NEED_LIBS(nq, [client common sdl win server], [nq/source], a)
if test -n "$CL_TARGETS"; then if test -n "$CL_TARGETS"; then
CD_TARGETS="libs/audio/libQFcd.la" CD_TARGETS="libs/audio/libQFcd.la"
SND_TARGETS="libs/audio/libQFsound.la" SND_TARGETS="libs/audio/libQFsound.la"
AUDIO_TARGETS="testsound\$(EXEEXT)" AUDIO_TARGETS="libs/audio/test/testsound\$(EXEEXT)"
JOY_TARGETS="libs/video/targets/libQFjs.la" JOY_TARGETS="libs/video/targets/libQFjs.la"
else else
unset CDTYPE unset CDTYPE

1
libs/audio/Makemodule.am
View file

@ -1,5 +1,6 @@
include libs/audio/targets/Makemodule.am include libs/audio/targets/Makemodule.am
include libs/audio/renderer/Makemodule.am include libs/audio/renderer/Makemodule.am
include libs/audio/test/Makemodule.am
plugin_LTLIBRARIES += @cd_plugins@ plugin_LTLIBRARIES += @cd_plugins@
noinst_LTLIBRARIES += @cd_static_plugins@ noinst_LTLIBRARIES += @cd_static_plugins@

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

@ -1,16 +0,0 @@
AUTOMAKE_OPTIONS= foreign
AM_CPPFLAGS= -I$(top_srcdir)/include
noinst_PROGRAMS= @AUDIO_TARGETS@
EXTRA_PROGRAMS= testsound
test_libs= \
libs/audio/libQFsound.la \
libs/ruamoko/libQFruamoko.la \
libs/util/libQFutil.la
testsound_SOURCES= testsound.c
testsound_LDADD= $(test_libs)
testsound_DEPENDENCIES= $(test_libs)

12
libs/audio/test/Makemodule.am Normal file
View file

@ -0,0 +1,12 @@
noinst_PROGRAMS += @AUDIO_TARGETS@
EXTRA_PROGRAMS += libs/audio/test/testsound
testaudio_libs= \
libs/audio/libQFsound.la \
libs/ruamoko/libQFruamoko.la \
libs/util/libQFutil.la
libs_audio_test_testsound_SOURCES= libs/audio/test/testsound.c
libs_audio_test_testsound_LDADD= $(testaudio_libs)
libs_audio_test_testsound_DEPENDENCIES= $(testaudio_libs)

2
libs/audio/test/testsound.c
View file

@ -65,7 +65,7 @@ init (void)
testsound_args = Cbuf_ArgsNew (); testsound_args = Cbuf_ArgsNew ();
Sys_Init (); Sys_Init ();
COM_ParseConfig (); COM_ParseConfig (testsound_cbuf);
Cvar_Get ("cmd_warncmd", "1", CVAR_NONE, NULL, NULL); Cvar_Get ("cmd_warncmd", "1", CVAR_NONE, NULL, NULL);
Memory_Init (Sys_Alloc (MEMSIZE), MEMSIZE); Memory_Init (Sys_Alloc (MEMSIZE), MEMSIZE);