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

Fix static builds.

Browse source
This commit is contained in:
Bill Currie 2012-02-07 20:17:32 +09:00
parent 8ecf74753c
commit 0a277376ed
4 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/Makefile.am
View file

@ -6,5 +6,5 @@ AUTOMAKE_OPTIONS= foreign
# models depends on image
# video depends on models(?), image(?) and gamecode
# console depends on video, ruamoko and audio
SUBDIRS=util gib gamecode ruamoko audio image models video console \
SUBDIRS=util gib gamecode ruamoko image models audio video console \
net qw

1
libs/audio/Makefile.am
View file

@ -59,6 +59,7 @@ cd_xmms_la_SOURCES= cd_xmms.c
sound_libs= \
@SND_PLUGIN_STATIC_LIBS@ \
@SND_REND_STATIC_LIBS@ \
$(top_builddir)/libs/models/libQFmodels.la \
$(top_builddir)/libs/gamecode/libQFgamecode.la \
$(top_builddir)/libs/util/libQFutil.la

20
libs/audio/renderer/Makefile.am
View file

@ -1,6 +1,7 @@
AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_PIC@ @VORBIS_CFLAGS@ @OGG_CFLAGS@ @SAMPLERATE_CFLAGS@
AM_CFLAGS= @PREFER_PIC@ \
$(VORBIS_CFLAGS) $(OGG_CFLAGS) $(SAMPLERATE_CFLAGS) $(JACK_CFLAGS)
INCLUDES= -I$(top_srcdir)/include
plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
plugin_libadd= @plugin_libadd@
@ -34,20 +35,23 @@ endif
have_wav_src=$(wav_src)
format_src=$(have_flac_src) $(have_midi_src) $(have_vorbis_src) $(have_wav_src)
format_libs= \
$(SAMPLERATE_LIBS) $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(FLAC_LIBS) \
$(OGG_LIBS) $(WM_LIBS)
extra_format_src=flac.c midi.c vorbis.c wav.c
snd_common=snd_channels.c snd_mem.c snd_mix.c snd_resample.c snd_sfx.c
snd_libs=$(SAMPLERATE_LIBS) $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(FLAC_LIBS) \
$(OGG_LIBS) $(WM_LIBS)
snd_deps=$(top_builddir)/libs/util/libQFutil.la
snd_libs= \
$(top_builddir)/libs/models/libQFmodels.la \
$(top_builddir)/libs/util/libQFutil.la
snd_render_default_la_LDFLAGS= $(plugin_ldflags)
snd_render_default_la_SOURCES= snd_dma.c $(snd_common) $(format_src)
snd_render_default_la_LIBADD= $(snd_deps) $(snd_libs)
snd_render_default_la_DEPENDENCIES= $(snd_deps)
snd_render_default_la_LIBADD= $(snd_libs) $(format_libs)
snd_render_default_la_DEPENDENCIES= $(snd_libs)
EXTRA_snd_render_default_la_SOURCES=$(extra_format_src)
snd_render_jack_la_LDFLAGS= $(plugin_ldflags)
snd_render_jack_la_SOURCES= snd_jack.c $(snd_common) $(format_src)
snd_render_jack_la_LIBADD= $(snd_deps) $(snd_libs)
snd_render_jack_la_DEPENDENCIES= $(snd_deps)
snd_render_jack_la_LIBADD= $(snd_libs) $(format_libs) $(JACK_LIBS)
snd_render_jack_la_DEPENDENCIES= $(snd_libs)
EXTRA_snd_render_jack_la_SOURCES= $(extra_format_src)

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

@ -8,6 +8,7 @@ EXTRA_PROGRAMS= testsound
test_libs= \
$(top_builddir)/libs/audio/libQFsound.la \
$(top_builddir)/libs/models/libQFmodels.la \
$(top_builddir)/libs/gamecode/libQFgamecode.la \
$(top_builddir)/libs/util/libQFutil.la