mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-01-17 22:50:51 +00:00
Build system updates/fixes for audio libs. MUCH cleaner, probably
faster, doesn't do anything unnecessary any more as far as I can tell.
This commit is contained in:
parent
180fe60c10
commit
e6d7aec03a
4 changed files with 53 additions and 99 deletions
|
@ -1,21 +1,11 @@
|
|||
SUBDIRS= cd targets renderer
|
||||
SUBDIRS=cd targets renderer
|
||||
INCLUDES=-I$(top_srcdir)/include
|
||||
|
||||
clean-local:
|
||||
rm -f *.a
|
||||
lib_LTLIBRARIES= @CD_TARGETS@ @SND_TARGETS@
|
||||
EXTRA_LTLIBRARIES= libQFsound.la libQFcd.la
|
||||
|
||||
INCLUDES= -I$(top_srcdir)/include
|
||||
libQFsound_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir)
|
||||
libQFsound_la_SOURCES= snd.c
|
||||
|
||||
lib_LTLIBRARIES= @CD_TARGETS@ @SND_TARGETS@
|
||||
EXTRA_LTLIBRARIES= libQFsound.la libQFcd.la
|
||||
|
||||
libQFsound_la_LDFLAGS= -version-info 1:0:0
|
||||
libQFsound_la_SOURCES= snd.c
|
||||
libQFsound.la: $(libQFsound_la_OBJECTS) $(libQFsound_la_DEPENDENCIES)
|
||||
$(LINK) -rpath $(libdir) $(libQFsound_la_LDFLAGS) $(libQFsound_la_OBJECTS) $(libQFsound_la_LIBADD) $(LIBS)
|
||||
|
||||
libQFcd_la_LDFLAGS= -version-info 1:0:0
|
||||
libQFcd_la_SOURCES= cd.c
|
||||
libQFcd.la: $(libQFcd_la_OBJECTS) $(libQFcd_la_DEPENDENCIES)
|
||||
$(LINK) -rpath $(libdir) $(libQFcd_la_LDFLAGS) $(libQFcd_la_OBJECTS) $(libQFcd_la_LIBADD) $(LIBS)
|
||||
|
||||
LIBLIST = libQFsound.la libQFcd.la @LIBRARY_SEARCH_PATH@
|
||||
libQFcd_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir)
|
||||
libQFcd_la_SOURCES= cd.c
|
||||
|
|
|
@ -5,30 +5,19 @@ pkglibdir = @PLUGINDIR@
|
|||
pkglib_LTLIBRARIES= @CD_PLUGIN_TARGETS@
|
||||
EXTRA_LTLIBRARIES= libcd_linux.la libcd_sdl.la libcd_sgi.la libcd_win.la libcd_null.la
|
||||
|
||||
libcd_linux_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath)
|
||||
libcd_linux_la_SOURCES= cd_linux.c
|
||||
|
||||
libcd_linux_la_LDFLAGS= -version-info 1:0:0
|
||||
libcd_linux_la_SOURCES= cd_linux.c
|
||||
libcd_linux.la: $(libcd_linux_la_OBJECTS) $(libcd_linux_la_DEPENDENCIES)
|
||||
$(LINK) -rpath $(pluginpath) $(libcd_linux_la_LDFLAGS) $(libcd_linux_la_OBJECTS) $(libcd_linux_la_LIBADD) $(LIBS)
|
||||
libcd_sdl_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath)
|
||||
libcd_sdl_la_LIBADD= $(SDL_LIBS)
|
||||
libcd_sdl_la_SOURCES= cd_sdl.c
|
||||
|
||||
libcd_sdl_la_LDFLAGS= -version-info 1:0:0 $(SDL_LIBS)
|
||||
libcd_sdl_la_SOURCES= cd_sdl.c
|
||||
libcd_sdl.la: $(libcd_sdl_la_OBJECTS) $(libcd_sdl_la_DEPENDENCIES)
|
||||
$(LINK) -rpath $(pluginpath) $(libcd_sdl_la_LDFLAGS) $(libcd_sdl_la_OBJECTS) $(libcd_sdl_la_LIBADD) $(LIBS)
|
||||
libcd_sgi_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath)
|
||||
libcd_sgi_la_LIBADD= $(SGI_CD_LIBS)
|
||||
libcd_sgi_la_SOURCES= cd_sgi.c
|
||||
|
||||
libcd_sgi_la_LDFLAGS= -version-info 1:0:0 $(SGI_CD_LIBS)
|
||||
libcd_sgi_la_SOURCES= cd_sgi.c
|
||||
libcd_sgi.la: $(libcd_sgi_la_OBJECTS) $(libcd_sgi_la_DEPENDENCIES)
|
||||
$(LINK) -rpath $(pluginpath) $(libcd_sgi_la_LDFLAGS) $(libcd_sgi_la_OBJECTS) $(libcd_sgi_la_LIBADD) $(LIBS)
|
||||
libcd_win_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath)
|
||||
libcd_win_la_SOURCES= cd_win.c
|
||||
|
||||
libcd_win_la_LDFLAGS= -version-info 1:0:0
|
||||
libcd_win_la_SOURCES= cd_win.c
|
||||
libcd_win.la: $(libcd_win_la_OBJECTS) $(libcd_win_la_DEPENDENCIES)
|
||||
$(LINK) -rpath $(pluginpath) $(libcd_win_la_LDFLAGS) $(libcd_win_la_OBJECTS) $(libcd_win_la_LIBADD) $(LIBS)
|
||||
|
||||
libcd_null_la_LDFLAGS= -version-info 1:0:0
|
||||
libcd_null_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath)
|
||||
libcd_null_la_SOURCES= cd_null.c
|
||||
libcd_null.la: $(libcd_null_la_OBJECTS) $(libcd_null_la_DEPENDENCIES)
|
||||
$(LINK) -rpath $(pluginpath) $(libcd_null_la_LDFLAGS) $(libcd_null_la_OBJECTS) $(libcd_null_la_LIBADD) $(LIBS)
|
||||
|
||||
LIBLIST = $(pkglib_LTLIBRARIES) @LIBRARY_SEARCH_PATH@
|
||||
|
|
|
@ -1,29 +1,18 @@
|
|||
INCLUDES= -I$(top_srcdir)/include
|
||||
|
||||
libdir = @PLUGINDIR@
|
||||
libdir= @PLUGINDIR@
|
||||
|
||||
if BUILD_SND_RENDERER
|
||||
SND_RENDERER = libsnd_render_default.la
|
||||
else
|
||||
SND_RENDERER =
|
||||
endif
|
||||
|
||||
lib_LTLIBRARIES = $(SND_RENDERER)
|
||||
EXTRA_LTLIBRARIES =
|
||||
lib_LTLIBRARIES= @SND_REND_TARGETS@
|
||||
EXTRA_LTLIBRARIES= libsnd_render_default.la
|
||||
noinst_LTLIBRARIES= libasm.la
|
||||
|
||||
if ASM_ARCH
|
||||
noinst_LTLIBRARIES = libasm.la
|
||||
libasm_la_SOURCES= snd_mixa.S
|
||||
else
|
||||
noinst_LTLIBRARIES =
|
||||
libasm_la_SOURCES=
|
||||
endif
|
||||
|
||||
libasm_la_SOURCES = snd_mixa.S
|
||||
|
||||
libsnd_render_default_la_LDFLAGS= -version-info 1:0:0
|
||||
libsnd_render_default_la_LIBADD = libasm.la
|
||||
libsnd_render_default_la_DEPENDENCIES = libasm.la
|
||||
libsnd_render_default_la_SOURCES= snd_dma.c snd_mem.c snd_mix.c
|
||||
libsnd_render_default.la: $(libsnd_render_default_la_OBJECTS) $(libsnd_render_default_la_DEPENDENCIES)
|
||||
$(LINK) -rpath $(pluginpath) $(libsnd_render_default_la_LDFLAGS) $(libsnd_render_default_la_OBJECTS) $(libsnd_render_default_la_LIBADD) $(LIBS)
|
||||
|
||||
LIBLIST = $(pkglib_LTLIBRARIES) libsnd_default_render.la @LIBRARY_SEARCH_PATH@
|
||||
libsnd_render_default_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath)
|
||||
libsnd_render_default_la_LIBADD= libasm.la
|
||||
libsnd_render_default_la_DEPENDENCIES= libasm.la
|
||||
libsnd_render_default_la_SOURCES= snd_dma.c snd_mem.c snd_mix.c
|
||||
|
|
|
@ -5,49 +5,35 @@ libdir = @PLUGINDIR@
|
|||
lib_LTLIBRARIES = @SND_PLUGIN_TARGETS@
|
||||
EXTRA_LTLIBRARIES = libsnd_output_sdl.la libsnd_output_alsa0_5.la libsnd_output_alsa0_9.la libsnd_output_oss.la libsnd_output_sgi.la libsnd_output_sun.la libsnd_output_win.la libsnd_output_null.la libsnd_output_disk.la
|
||||
|
||||
libsnd_output_sdl_la_LDFLAGS= -version-info 1:0:0 $(SDL_LIBS)
|
||||
libsnd_output_sdl_la_SOURCES= snd_sdl.c
|
||||
libsnd_output_sdl.la: $(libsnd_output_sdl_la_OBJECTS) $(libsnd_output_sdl_la_DEPENDENCIES)
|
||||
$(LINK) -rpath $(pluginpath) $(libsnd_output_sdl_la_LDFLAGS) $(libsnd_output_sdl_la_OBJECTS) $(libsnd_output_sdl_la_LIBADD) $(LIBS)
|
||||
libsnd_output_sdl_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath)
|
||||
libsnd_output_sdl_la_LIBADD= $(SDL_LIBS)
|
||||
libsnd_output_sdl_la_SOURCES= snd_sdl.c
|
||||
|
||||
libsnd_output_alsa0_5_la_LDFLAGS= -version-info 1:0:0 $(ALSA_LIBS)
|
||||
libsnd_output_alsa0_5_la_SOURCES= snd_alsa_0_5.c
|
||||
libsnd_output_alsa0_5.la: $(libsnd_output_alsa0_5_la_OBJECTS) $(libsnd_output_alsa0_5_la_DEPENDENCIES)
|
||||
$(LINK) -rpath $(pluginpath) $(libsnd_output_alsa0_5_la_LDFLAGS) $(libsnd_output_alsa0_5_la_OBJECTS) $(libsnd_output_alsa0_5_la_LIBADD) $(LIBS)
|
||||
libsnd_output_alsa0_5_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath)
|
||||
libsnd_output_alsa0_5_la_LIBADD= $(ALSA_LIBS)
|
||||
libsnd_output_alsa0_5_la_SOURCES= snd_alsa_0_5.c
|
||||
|
||||
libsnd_output_alsa0_9_la_LDFLAGS= -version-info 1:0:0 $(ALSA_LIBS)
|
||||
libsnd_output_alsa0_9_la_SOURCES= snd_alsa_0_9.c
|
||||
libsnd_output_alsa0_9.la: $(libsnd_output_alsa0_9_la_OBJECTS) $(libsnd_output_alsa0_9_la_DEPENDENCIES)
|
||||
$(LINK) -rpath $(pluginpath) $(libsnd_output_alsa0_9_la_LDFLAGS) $(libsnd_output_alsa0_9_la_OBJECTS) $(libsnd_output_alsa0_9_la_LIBADD) $(LIBS)
|
||||
libsnd_output_alsa0_9_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath)
|
||||
libsnd_output_alsa0_9_la_LIBADD= $(ALSA_LIBS)
|
||||
libsnd_output_alsa0_9_la_SOURCES= snd_alsa_0_9.c
|
||||
|
||||
libsnd_output_oss_la_LDFLAGS= -version-info 1:0:0 $(OSS_LIBS)
|
||||
libsnd_output_oss_la_SOURCES= snd_oss.c
|
||||
libsnd_output_oss.la: $(libsnd_output_oss_la_OBJECTS) $(libsnd_output_oss_la_DEPENDENCIES)
|
||||
$(LINK) -rpath $(pluginpath) $(libsnd_output_oss_la_LDFLAGS) $(libsnd_output_oss_la_OBJECTS) $(libsnd_output_oss_la_LIBADD) $(LIBS)
|
||||
libsnd_output_oss_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath)
|
||||
libsnd_output_oss_la_LIBADD= $(OSS_LIBS)
|
||||
libsnd_output_oss_la_SOURCES= snd_oss.c
|
||||
|
||||
libsnd_output_sgi_la_LDFLAGS= -version-info 1:0:0 $(SGISND_LIBS)
|
||||
libsnd_output_sgi_la_SOURCES= snd_sgi.c
|
||||
libsnd_output_sgi.la: $(libsnd_output_sgi_la_OBJECTS) $(libsnd_output_sgi_la_DEPENDENCIES)
|
||||
$(LINK) -rpath $(pluginpath) $(libsnd_output_sgi_la_LDFLAGS) $(libsnd_output_sgi_la_OBJECTS) $(libsnd_output_sgi_la_LIBADD) $(LIBS)
|
||||
libsnd_output_sgi_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath)
|
||||
libsnd_output_sgi_la_LIBADD= $(SGISND_LIBS)
|
||||
libsnd_output_sgi_la_SOURCES= snd_sgi.c
|
||||
|
||||
libsnd_output_sun_la_LDFLAGS= -version-info 1:0:0
|
||||
libsnd_output_sun_la_SOURCES= snd_sun.c
|
||||
libsnd_output_sun.la: $(libsnd_output_sun_la_OBJECTS) $(libsnd_output_sun_la_DEPENDENCIES)
|
||||
$(LINK) -rpath $(pluginpath) $(libsnd_output_sun_la_LDFLAGS) $(libsnd_output_sun_la_OBJECTS) $(libsnd_output_sun_la_LIBADD) $(LIBS)
|
||||
libsnd_output_sun_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath)
|
||||
libsnd_output_sun_la_SOURCES= snd_sun.c
|
||||
|
||||
libsnd_output_win_la_LDFLAGS= -version-info 1:0:0 $(WINSND_LIBS)
|
||||
libsnd_output_win_la_SOURCES= snd_win.c
|
||||
libsnd_output_win.la: $(libsnd_output_win_la_OBJECTS) $(libsnd_output_win_la_DEPENDENCIES)
|
||||
$(LINK) -rpath $(pluginpath) $(libsnd_output_win_la_LDFLAGS) $(libsnd_output_win_la_OBJECTS) $(libsnd_output_win_la_LIBADD) $(LIBS)
|
||||
libsnd_output_win_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath)
|
||||
libsnd_output_win_la_LIBADD= $(WINSND_LIBS)
|
||||
libsnd_output_win_la_SOURCES= snd_win.c
|
||||
|
||||
libsnd_output_disk_la_LDFLAGS= -version-info 1:0:0
|
||||
libsnd_output_disk_la_SOURCES= snd_disk.c
|
||||
libsnd_output_disk.la: $(libsnd_output_disk_la_OBJECTS) $(libsnd_output_disk_la_DEPENDENCIES)
|
||||
$(LINK) -rpath $(pluginpath) $(libsnd_output_disk_la_LDFLAGS) $(libsnd_output_disk_la_OBJECTS) $(libsnd_output_disk_la_LIBADD) $(LIBS)
|
||||
libsnd_output_disk_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath)
|
||||
libsnd_output_disk_la_SOURCES= snd_disk.c
|
||||
|
||||
libsnd_output_null_la_LDFLAGS= -version-info 1:0:0
|
||||
libsnd_output_null_la_SOURCES= snd_null.c
|
||||
libsnd_output_null.la: $(libsnd_output_null_la_OBJECTS) $(libsnd_output_null_la_DEPENDENCIES)
|
||||
$(LINK) -rpath $(pluginpath) $(libsnd_output_null_la_LDFLAGS) $(libsnd_output_null_la_OBJECTS) $(libsnd_output_null_la_LIBADD) $(LIBS)
|
||||
|
||||
LIBLIST = $(pkglib_LTLIBRARIES) @LIBRARY_SEARCH_PATH@
|
||||
libsnd_output_null_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath)
|
||||
libsnd_output_null_la_SOURCES= snd_null.c
|
||||
|
|
Loading…
Reference in a new issue