mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2024-11-22 12:31:10 +00:00
Do an audit of the Makefile.am files.
o All instances of LIBADD/LDADD have a corresponding DEPENDENCIES
specificatiion.
o libraries now use a lib_ldflags macro to keep things consistent
o duplication of source/lib names has been minimized (particularly in
the libraries; more work needs to be done for the executables)
o automake spec blocks have been organized (again, more work needs to be
done for the executables)
This commit is contained in:
Bill Currie
parent
b7e5ad6306
commit
9fbff2f4d5
20 changed files with 294 additions and 178 deletions
|
|
@ -38,10 +38,16 @@ bin_PROGRAMS= @HW_TARGETS@
|
|||
EXTRA_PROGRAMS= hw-master
|
||||
|
||||
common_ldflags= -export-dynamic
|
||||
hw_master_libs= \
|
||||
$(top_builddir)/libs/net/libnet_chan.la \
|
||||
$(SERVER_PLUGIN_STATIC_LIBS) \
|
||||
$(top_builddir)/libs/console/libQFconsole.la \
|
||||
$(top_builddir)/libs/util/libQFutil.la
|
||||
|
||||
hw_master_SOURCES= master.c
|
||||
hw_master_LDADD= $(top_builddir)/libs/net/libnet_chan.la $(SERVER_PLUGIN_STATIC_LIBS) $(top_builddir)/libs/console/libQFconsole.la $(top_builddir)/libs/util/libQFutil.la $(NET_LIBS)
|
||||
hw_master_LDFLAGS= $(common_ldflags)
|
||||
hw_master_LDFLAGS= $(common_ldflags)
|
||||
hw_master_LDADD= $(hw_master_libs) $(NET_LIBS)
|
||||
hw_master_DEPENDENCIES= $(hw_master_libs)
|
||||
hw_master_SOURCES= master.c
|
||||
|
||||
# Kill the temp files, hopefully.
|
||||
CLEANFILES = *.i *.s $(YACCLEX_CLEANFILES)
|
||||
CLEANFILES = *.i *.s
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
AUTOMAKE_OPTIONS= foreign
|
||||
|
||||
# everything depends on util
|
||||
# gamecode depends on gib (only for builtins, not the engine)
|
||||
# ruamoko depends on gamecode (engine only, not builtins)
|
||||
# ruamoko depends on gamecode and gib
|
||||
# audio depends on gamecode
|
||||
# console depends on ruamoko and audio
|
||||
SUBDIRS=util image gib gamecode ruamoko models audio console net qw \
|
||||
video
|
||||
# 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 \
|
||||
net qw
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ SDL_LIBS= @SDL_LIBS@
|
|||
XMMS_LIBS= @XMMS_LIBS@
|
||||
plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
|
||||
plugin_libadd= @plugin_libadd@
|
||||
lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
|
||||
-rpath $(libdir) -no-undefined
|
||||
EXEEXT=
|
||||
|
||||
plugin_LTLIBRARIES= @CD_PLUGIN_TARGETS@
|
||||
|
|
@ -16,32 +18,43 @@ EXTRA_LTLIBRARIES= libQFsound.la libQFcd.la \
|
|||
cd_file.la cd_linux.la cd_sdl.la cd_sgi.la cd_win.la \
|
||||
cd_xmms.la
|
||||
|
||||
cd_file_la_LDFLAGS= $(plugin_ldflags)
|
||||
cd_file_la_LIBADD= $(top_builddir)/libs/util/libQFutil.la $(top_builddir)/libs/audio/libQFsound.la
|
||||
cd_file_la_SOURCES= cd_file.c
|
||||
cd_file_la_DEPENDENCIES=libQFsound.la
|
||||
cd_plug_libs=$(top_builddir)/libs/util/libQFutil.la
|
||||
|
||||
cd_linux_la_LDFLAGS= $(plugin_ldflags)
|
||||
cd_linux_la_LIBADD= $(top_builddir)/libs/util/libQFutil.la
|
||||
cd_linux_la_SOURCES= cd_linux.c
|
||||
cd_file_libs= \
|
||||
$(top_builddir)/libs/audio/libQFsound.la \
|
||||
$(cd_plug_libs)
|
||||
|
||||
cd_sdl_la_LDFLAGS= $(plugin_ldflags)
|
||||
cd_sdl_la_LIBADD= $(SDL_LIBS) $(plugin_libadd) $(top_builddir)/libs/util/libQFutil.la
|
||||
cd_sdl_la_CFLAGS= $(SDL_CFLAGS)
|
||||
cd_sdl_la_SOURCES= cd_sdl.c
|
||||
cd_file_la_LDFLAGS= $(plugin_ldflags)
|
||||
cd_file_la_LIBADD= $(cd_file_libs)
|
||||
cd_file_la_DEPENDENCIES= $(cd_file_libs)
|
||||
cd_file_la_SOURCES= cd_file.c
|
||||
|
||||
cd_sgi_la_LDFLAGS= $(plugin_ldflags)
|
||||
cd_sgi_la_LIBADD= $(SGI_CD_LIBS)
|
||||
cd_sgi_la_SOURCES= cd_sgi.c
|
||||
cd_linux_la_LDFLAGS= $(plugin_ldflags)
|
||||
cd_linux_la_LIBADD= $(cd_plug_libs)
|
||||
cd_linux_la_DEPENDENCIES= $(cd_plug_libs)
|
||||
cd_linux_la_SOURCES= cd_linux.c
|
||||
|
||||
cd_win_la_LDFLAGS= $(plugin_ldflags)
|
||||
cd_win_la_LIBADD= $(plugin_libadd)
|
||||
cd_win_la_SOURCES= cd_win.c
|
||||
cd_sdl_la_LDFLAGS= $(plugin_ldflags)
|
||||
cd_sdl_la_LIBADD= $(cd_plug_libs) $(SDL_LIBS) $(plugin_libadd)
|
||||
cd_sdl_la_DEPENDENCIES= $(cd_plug_libs)
|
||||
cd_sdl_la_CFLAGS= $(SDL_CFLAGS)
|
||||
cd_sdl_la_SOURCES= cd_sdl.c
|
||||
|
||||
cd_xmms_la_LDFLAGS= $(plugin_ldflags)
|
||||
cd_xmms_la_LIBADD= $(XMMS_LIBS) $(top_builddir)/libs/util/libQFutil.la
|
||||
cd_xmms_la_CFLAGS= $(XMMS_CFLAGS)
|
||||
cd_xmms_la_SOURCES= cd_xmms.c
|
||||
cd_sgi_la_LDFLAGS= $(plugin_ldflags)
|
||||
cd_sgi_la_LIBADD= $(cd_plug_libs) $(SGI_CD_LIBS)
|
||||
cd_sgi_la_DEPENDENCIES= $(cd_plug_libs)
|
||||
cd_sgi_la_SOURCES= cd_sgi.c
|
||||
|
||||
cd_win_la_LDFLAGS= $(plugin_ldflags)
|
||||
cd_win_la_LIBADD= $(cd_plug_libs) $(plugin_libadd)
|
||||
cd_win_la_DEPENDENCIES= $(cd_plug_libs)
|
||||
cd_win_la_SOURCES= cd_win.c
|
||||
|
||||
cd_xmms_la_LDFLAGS= $(plugin_ldflags)
|
||||
cd_xmms_la_LIBADD= $(cd_plug_libs) $(XMMS_LIBS)
|
||||
cd_xmms_la_DEPENDENCIES= $(cd_plug_libs)
|
||||
cd_xmms_la_CFLAGS= $(XMMS_CFLAGS)
|
||||
cd_xmms_la_SOURCES= cd_xmms.c
|
||||
|
||||
sound_libs= \
|
||||
@SND_PLUGIN_STATIC_LIBS@ \
|
||||
|
|
@ -53,12 +66,12 @@ cd_libs= \
|
|||
@CD_PLUGIN_STATIC_LIBS@ \
|
||||
$(top_builddir)/libs/util/libQFutil.la
|
||||
|
||||
libQFsound_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir)
|
||||
libQFsound_la_LIBADD= $(sound_libs)
|
||||
libQFsound_la_SOURCES= snd.c snd_progs.c
|
||||
libQFsound_la_LDFLAGS= $(lib_ldflags)
|
||||
libQFsound_la_LIBADD= $(sound_libs)
|
||||
libQFsound_la_DEPENDENCIES= $(sound_libs)
|
||||
libQFsound_la_SOURCES= snd.c snd_progs.c
|
||||
|
||||
libQFcd_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir)
|
||||
libQFcd_la_LIBADD= $(cd_libs)
|
||||
libQFcd_la_SOURCES= cd.c
|
||||
libQFcd_la_DEPENDENCIES= $(cd_libs)
|
||||
libQFcd_la_LDFLAGS= $(lib_ldflags)
|
||||
libQFcd_la_LIBADD= $(cd_libs)
|
||||
libQFcd_la_DEPENDENCIES= $(cd_libs)
|
||||
libQFcd_la_SOURCES= cd.c
|
||||
|
|
|
|||
|
|
@ -35,16 +35,19 @@ have_wav_src=$(wav_src)
|
|||
|
||||
format_src=$(have_flac_src) $(have_midi_src) $(have_vorbis_src) $(have_wav_src)
|
||||
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_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_render_default_la_LDFLAGS= $(plugin_ldflags)
|
||||
snd_render_default_la_SOURCES= snd_dma.c $(snd_common) $(format_src)
|
||||
snd_render_default_la_LIBADD= $(SAMPLERATE_LIBS) $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(FLAC_LIBS) $(OGG_LIBS) $(WM_LIBS) $(top_builddir)/libs/util/libQFutil.la $(top_builddir)/libs/models/libQFmodels.la
|
||||
snd_render_default_la_DEPENDENCIES=
|
||||
EXTRA_snd_render_default_la_SOURCES= $(extra_format_src)
|
||||
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)
|
||||
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= $(SAMPLERATE_LIBS) $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(FLAC_LIBS) $(OGG_LIBS) $(WM_LIBS) $(JACK_LIBS) $(top_builddir)/libs/util/libQFutil.la $(top_builddir)/libs/models/libQFmodels.la
|
||||
snd_render_jack_la_DEPENDENCIES=
|
||||
EXTRA_snd_render_jack_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)
|
||||
EXTRA_snd_render_jack_la_SOURCES= $(extra_format_src)
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ SDL_LIBS = @SDL_LIBS@
|
|||
plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
|
||||
plugin_libadd= @plugin_libadd@
|
||||
EXEEXT=
|
||||
snd_deps=$(top_builddir)/libs/util/libQFutil.la
|
||||
|
||||
plugin_LTLIBRARIES= @SND_PLUGIN_TARGETS@
|
||||
noinst_LTLIBRARIES= @SND_PLUGIN_STATIC@
|
||||
|
|
@ -13,41 +14,49 @@ EXTRA_LTLIBRARIES= \
|
|||
snd_output_sdl.la snd_output_alsa.la snd_output_oss.la snd_output_sgi.la \
|
||||
snd_output_sun.la snd_output_win.la snd_output_dx.la snd_output_disk.la
|
||||
|
||||
snd_output_sdl_la_LDFLAGS= $(plugin_ldflags)
|
||||
snd_output_sdl_la_LIBADD= $(SDL_LIBS) $(plugin_libadd) $(top_builddir)/libs/util/libQFutil.la
|
||||
snd_output_sdl_la_CFLAGS= $(SDL_CFLAGS)
|
||||
snd_output_sdl_la_SOURCES= snd_sdl.c
|
||||
snd_output_sdl_la_LDFLAGS= $(plugin_ldflags)
|
||||
snd_output_sdl_la_LIBADD= $(snd_deps) $(SDL_LIBS) $(plugin_libadd)
|
||||
snd_output_sdl_la_DEPENDENCIES= $(snd_deps)
|
||||
snd_output_sdl_la_CFLAGS= $(SDL_CFLAGS)
|
||||
snd_output_sdl_la_SOURCES= snd_sdl.c
|
||||
|
||||
snd_output_alsa_la_LDFLAGS= $(plugin_ldflags)
|
||||
snd_output_alsa_la_LIBADD= $(top_builddir)/libs/util/libQFutil.la
|
||||
snd_output_alsa_la_CFLAGS= $(ALSA_CFLAGS)
|
||||
snd_output_alsa_la_SOURCES= snd_alsa.c
|
||||
snd_output_alsa_la_LDFLAGS= $(plugin_ldflags)
|
||||
snd_output_alsa_la_LIBADD= $(snd_deps)
|
||||
snd_output_alsa_la_DEPENDENCIES=$(snd_deps)
|
||||
snd_output_alsa_la_CFLAGS= $(ALSA_CFLAGS)
|
||||
snd_output_alsa_la_SOURCES= snd_alsa.c
|
||||
|
||||
snd_output_oss_la_LDFLAGS= $(plugin_ldflags)
|
||||
snd_output_oss_la_LIBADD= $(OSS_LIBS) $(top_builddir)/libs/util/libQFutil.la
|
||||
snd_output_oss_la_CFLAGS= $(OSS_CFLAGS)
|
||||
snd_output_oss_la_SOURCES= snd_oss.c
|
||||
snd_output_oss_la_LDFLAGS= $(plugin_ldflags)
|
||||
snd_output_oss_la_LIBADD= $(snd_deps) $(OSS_LIBS)
|
||||
snd_output_oss_la_DEPENDENCIES= $(snd_deps)
|
||||
snd_output_oss_la_CFLAGS= $(OSS_CFLAGS)
|
||||
snd_output_oss_la_SOURCES= snd_oss.c
|
||||
|
||||
snd_output_sgi_la_LDFLAGS= $(plugin_ldflags)
|
||||
snd_output_sgi_la_LIBADD= $(SGISND_LIBS)
|
||||
snd_output_sgi_la_CFLAGS= $(SGISND_CFLAGS)
|
||||
snd_output_sgi_la_SOURCES= snd_sgi.c
|
||||
snd_output_sgi_la_LDFLAGS= $(plugin_ldflags)
|
||||
snd_output_sgi_la_LIBADD= $(snd_deps) $(SGISND_LIBS)
|
||||
snd_output_sgi_la_DEPENDENCIES= $(snd_deps)
|
||||
snd_output_sgi_la_CFLAGS= $(SGISND_CFLAGS)
|
||||
snd_output_sgi_la_SOURCES= snd_sgi.c
|
||||
|
||||
snd_output_sun_la_LDFLAGS= $(plugin_ldflags)
|
||||
snd_output_sun_la_CFLAGS= $(SUNSND_CFLAGS)
|
||||
snd_output_sun_la_SOURCES= snd_sun.c
|
||||
snd_output_sun_la_LDFLAGS= $(plugin_ldflags)
|
||||
snd_output_sun_la_DEPENDENCIES= $(snd_deps)
|
||||
snd_output_sun_la_CFLAGS= $(SUNSND_CFLAGS)
|
||||
snd_output_sun_la_SOURCES= snd_sun.c
|
||||
|
||||
snd_output_win_la_LDFLAGS= $(plugin_ldflags)
|
||||
snd_output_win_la_LIBADD= $(WINSND_LIBS) $(plugin_libadd)
|
||||
snd_output_win_la_CFLAGS= $(WIN32SND_CFLAGS)
|
||||
snd_output_win_la_SOURCES= snd_win.c
|
||||
snd_output_win_la_LDFLAGS= $(plugin_ldflags)
|
||||
snd_output_win_la_LIBADD= $(snd_deps) $(WINSND_LIBS) $(plugin_libadd)
|
||||
snd_output_win_la_DEPENDENCIES= $(snd_deps)
|
||||
snd_output_win_la_CFLAGS= $(WIN32SND_CFLAGS)
|
||||
snd_output_win_la_SOURCES= snd_win.c
|
||||
|
||||
snd_output_dx_la_LDFLAGS= $(plugin_ldflags)
|
||||
snd_output_dx_la_LIBADD= $(WINSND_LIBS) $(plugin_libadd)
|
||||
snd_output_dx_la_CFLAGS= $(WIN32SND_CFLAGS)
|
||||
snd_output_dx_la_SOURCES= snd_dx.c
|
||||
snd_output_dx_la_LDFLAGS= $(plugin_ldflags)
|
||||
snd_output_dx_la_LIBADD= $(snd_deps) $(WINSND_LIBS) $(plugin_libadd)
|
||||
snd_output_dx_la_DEPENDENCIES= $(snd_deps)
|
||||
snd_output_dx_la_CFLAGS= $(WIN32SND_CFLAGS)
|
||||
snd_output_dx_la_SOURCES= snd_dx.c
|
||||
|
||||
snd_output_disk_la_LDFLAGS= $(plugin_ldflags)
|
||||
snd_output_disk_la_LIBADD= $(plugin_libadd) $(top_builddir)/libs/util/libQFutil.la
|
||||
snd_output_disk_la_LDFLAGS= $(plugin_ldflags)
|
||||
snd_output_disk_la_LIBADD= $(snd_deps) $(plugin_libadd)
|
||||
snd_output_disk_la_DEPENDENCIES=$(snd_deps)
|
||||
snd_output_disk_la_CFLAGS=
|
||||
snd_output_disk_la_SOURCES= snd_disk.c
|
||||
snd_output_disk_la_SOURCES= snd_disk.c
|
||||
|
|
|
|||
|
|
@ -6,6 +6,11 @@ noinst_PROGRAMS= @AUDIO_TARGETS@
|
|||
|
||||
EXTRA_PROGRAMS= testsound
|
||||
|
||||
testsound_SOURCES= testsound.c
|
||||
testsound_LDADD= $(top_builddir)/libs/audio/libQFsound.la $(top_builddir)/libs/gamecode/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la
|
||||
testsound_DEPENDENCIES= $(top_builddir)/libs/audio/libQFsound.la $(top_builddir)/libs/util/libQFutil.la
|
||||
test_libs= \
|
||||
$(top_builddir)/libs/audio/libQFsound.la \
|
||||
$(top_builddir)/libs/gamecode/libQFgamecode.la \
|
||||
$(top_builddir)/libs/util/libQFutil.la
|
||||
|
||||
testsound_SOURCES= testsound.c
|
||||
testsound_LDADD= $(test_libs)
|
||||
testsound_DEPENDENCIES= $(test_libs)
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ AM_CFLAGS= @PREFER_PIC@
|
|||
INCLUDES= -I$(top_srcdir)/include
|
||||
plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
|
||||
plugin_libadd= @plugin_libadd@
|
||||
lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
|
||||
-rpath $(libdir) -no-undefined
|
||||
EXEEXT=
|
||||
|
||||
lib_LTLIBRARIES= libQFconsole.la
|
||||
|
|
@ -16,14 +18,24 @@ common_sources= \
|
|||
client_sources= bi_inputline.c client.c menu.c pr_keys.c
|
||||
server_sources= server.c
|
||||
|
||||
libQFconsole_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir) -no-undefined
|
||||
libQFconsole_la_LIBADD= $(plugin_libadd) $(top_builddir)/libs/util/libQFutil.la
|
||||
libQFconsole_la_SOURCES= $(common_sources)
|
||||
console_deps=$(top_builddir)/libs/util/libQFutil.la
|
||||
client_deps= libQFconsole.la \
|
||||
$(top_builddir)/libs/audio/libQFsound.la \
|
||||
$(top_builddir)/libs/ruamoko/libQFruamoko.la \
|
||||
$(console_deps)
|
||||
server_deps= libQFconsole.la $(console_deps)
|
||||
|
||||
console_client_la_LDFLAGS= $(plugin_ldflags)
|
||||
console_client_la_LIBADD= $(plugin_libadd) libQFconsole.la $(top_builddir)/libs/audio/libQFsound.la $(top_builddir)/libs/ruamoko/libQFruamoko.la
|
||||
console_client_la_SOURCES= $(client_sources)
|
||||
libQFconsole_la_LDFLAGS= $(lib_ldflags)
|
||||
libQFconsole_la_LIBADD= $(console_deps) $(plugin_libadd)
|
||||
libQFconsole_la_DEPENDENCIES= $(console_deps)
|
||||
libQFconsole_la_SOURCES= $(common_sources)
|
||||
|
||||
console_server_la_LDFLAGS= $(plugin_ldflags)
|
||||
console_server_la_LIBADD= $(CURSES_LIBS) $(plugin_libadd) libQFconsole.la
|
||||
console_server_la_SOURCES= $(server_sources)
|
||||
console_client_la_LDFLAGS= $(plugin_ldflags)
|
||||
console_client_la_LIBADD= $(client_deps) $(plugin_libadd)
|
||||
console_client_la_DEPENDENCIES= $(client_deps)
|
||||
console_client_la_SOURCES= $(client_sources)
|
||||
|
||||
console_server_la_LDFLAGS= $(plugin_ldflags)
|
||||
console_server_la_LIBADD= $(server_deps) $(CURSES_LIBS) $(plugin_libadd)
|
||||
console_server_la_DEPENDENCIES= $(server_deps)
|
||||
console_server_la_SOURCES= $(server_sources)
|
||||
|
|
|
|||
|
|
@ -2,11 +2,16 @@ AUTOMAKE_OPTIONS= foreign
|
|||
|
||||
AM_CFLAGS= @PREFER_PIC@
|
||||
INCLUDES= -I$(top_srcdir)/include
|
||||
lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
|
||||
-rpath $(libdir) -no-undefined
|
||||
|
||||
gc_deps=$(top_builddir)/libs/util/libQFutil.la
|
||||
|
||||
lib_LTLIBRARIES= libQFgamecode.la
|
||||
|
||||
libQFgamecode_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -no-undefined
|
||||
libQFgamecode_la_LIBADD= $(top_builddir)/libs/util/libQFutil.la
|
||||
libQFgamecode_la_LDFLAGS= $(lib_ldflags)
|
||||
libQFgamecode_la_LIBADD= $(gc_deps)
|
||||
libQFgamecode_la_DEPENDENCIES= $(gc_deps)
|
||||
libQFgamecode_la_SOURCES= \
|
||||
pr_builtins.c pr_edict.c pr_debug.c pr_exec.c pr_load.c pr_parse.c \
|
||||
pr_opcode.c pr_resolve.c pr_resource.c pr_strings.c pr_zone.c
|
||||
|
|
|
|||
|
|
@ -2,11 +2,18 @@ AUTOMAKE_OPTIONS= foreign
|
|||
AM_CFLAGS= @PREFER_PIC@
|
||||
INCLUDES= -I$(top_srcdir)/include
|
||||
|
||||
lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
|
||||
-rpath $(libdir) -no-undefined
|
||||
|
||||
gib_deps=$(top_builddir)/libs/util/libQFutil.la
|
||||
|
||||
lib_LTLIBRARIES= libQFgib.la
|
||||
|
||||
libQFgib_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -no-undefined
|
||||
libQFgib_la_LIBADD= $(top_builddir)/libs/util/libQFutil.la
|
||||
libQFgib_la_LDFLAGS= $(lib_ldflags)
|
||||
libQFgib_la_LIBADD= $(gib_deps)
|
||||
libQFgib_la_DEPENDENCIES= $(gib_deps)
|
||||
libQFgib_la_SOURCES= \
|
||||
gib_buffer.c gib_builtin.c gib_classes.c gib_execute.c gib_function.c gib_parse.c gib_handle.c \
|
||||
gib_object.c gib_process.c gib_regex.c gib_thread.c gib_vars.c gib_init.c gib_tree.c \
|
||||
gib_buffer.c gib_builtin.c gib_classes.c gib_execute.c gib_function.c \
|
||||
gib_parse.c gib_handle.c gib_object.c gib_process.c gib_regex.c \
|
||||
gib_thread.c gib_vars.c gib_init.c gib_tree.c \
|
||||
gib_semantics.c ops.c exp.c regex.c
|
||||
|
|
|
|||
|
|
@ -2,11 +2,16 @@ AUTOMAKE_OPTIONS= foreign
|
|||
AM_CFLAGS= @PREFER_PIC@ $(PNG_CFLAGS)
|
||||
AM_CPPFLAGS= -I$(top_srcdir)/include
|
||||
|
||||
lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
|
||||
-rpath $(libdir) -no-undefined
|
||||
|
||||
image_deps=$(top_builddir)/libs/util/libQFutil.la
|
||||
|
||||
lib_LTLIBRARIES= libQFimage.la
|
||||
|
||||
libQFimage_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -no-undefined
|
||||
libQFimage_la_LIBADD= $(PNG_LIBS) $(top_builddir)/libs/util/libQFutil.la
|
||||
libQFimage_la_DEPENDENCIES=
|
||||
libQFimage_la_LDFLAGS= $(lib_ldflags)
|
||||
libQFimage_la_LIBADD= $(image_deps) $(PNG_LIBS)
|
||||
libQFimage_la_DEPENDENCIES= $(pmage_deps)
|
||||
libQFimage_la_SOURCES= \
|
||||
image.c pcx.c png.c tga.c
|
||||
|
||||
|
|
|
|||
|
|
@ -7,40 +7,48 @@ INCLUDES= -I$(top_srcdir)/include
|
|||
lib_LTLIBRARIES= libQFmodels.la @VID_MODEL_TARGETS@
|
||||
EXTRA_LTLIBRARIES= libQFmodels_gl.la libQFmodels_glsl.la libQFmodels_sw.la
|
||||
|
||||
lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
|
||||
-rpath $(libdir) -no-undefined
|
||||
|
||||
models_sources = clip_hull.c model.c portal.c skin.c trace.c winding.c
|
||||
|
||||
models_libs = \
|
||||
common_libs = \
|
||||
$(top_builddir)/libs/image/libQFimage.la \
|
||||
$(top_builddir)/libs/util/libQFutil.la
|
||||
|
||||
libQFmodels_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -no-undefined
|
||||
libQFmodels_la_LIBADD= brush/libbrush.la $(models_libs)
|
||||
libQFmodels_la_SOURCES= $(models_sources) null_model.c
|
||||
libQFmodels_la_DEPENDENCIES= brush/libbrush.la $(models_libs)
|
||||
models_libs=brush/libbrush.la $(common_libs)
|
||||
|
||||
gl_LIBS= \
|
||||
libQFmodels_la_LDFLAGS= $(lib_ldflags)
|
||||
libQFmodels_la_LIBADD= $(models_libs)
|
||||
libQFmodels_la_DEPENDENCIES= $(models_libs)
|
||||
libQFmodels_la_SOURCES= $(models_sources) null_model.c
|
||||
|
||||
gl_sources=gl_model_fullbright.c gl_skin.c
|
||||
gl_libs= \
|
||||
alias/libalias_gl.la \
|
||||
brush/libbrush_gl.la \
|
||||
sprite/libsprite_gl.la
|
||||
libQFmodels_gl_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir)
|
||||
libQFmodels_gl_la_LIBADD= $(gl_LIBS) $(models_libs)
|
||||
libQFmodels_gl_la_SOURCES= $(models_sources) gl_model_fullbright.c gl_skin.c
|
||||
libQFmodels_gl_la_DEPENDENCIES= $(gl_LIBS) $(models_libs)
|
||||
libQFmodels_gl_la_LDFLAGS= $(lib_ldflags)
|
||||
libQFmodels_gl_la_LIBADD= $(gl_libs)
|
||||
libQFmodels_gl_la_DEPENDENCIES= $(gl_libs)
|
||||
libQFmodels_gl_la_SOURCES= $(models_sources) $(gl_sources)
|
||||
|
||||
glsl_LIBS= \
|
||||
glsl_libs= \
|
||||
alias/libalias_glsl.la \
|
||||
brush/libbrush_glsl.la \
|
||||
sprite/libsprite_glsl.la
|
||||
libQFmodels_glsl_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir)
|
||||
libQFmodels_glsl_la_LIBADD= $(glsl_LIBS) $(models_libs)
|
||||
libQFmodels_glsl_la_SOURCES= $(models_sources) glsl_skin.c
|
||||
libQFmodels_glsl_la_DEPENDENCIES= $(glsl_LIBS) $(models_libs)
|
||||
sprite/libsprite_glsl.la \
|
||||
$(common_libs)
|
||||
libQFmodels_glsl_la_LDFLAGS= $(lib_ldflags)
|
||||
libQFmodels_glsl_la_LIBADD= $(glsl_libs)
|
||||
libQFmodels_glsl_la_DEPENDENCIES= $(glsl_libs)
|
||||
libQFmodels_glsl_la_SOURCES= $(models_sources) glsl_skin.c
|
||||
|
||||
sw_LIBS= \
|
||||
sw_libs= \
|
||||
alias/libalias_sw.la \
|
||||
brush/libbrush_sw.la \
|
||||
sprite/libsprite_sw.la
|
||||
libQFmodels_sw_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir) -no-undefined
|
||||
libQFmodels_sw_la_LIBADD= $(sw_LIBS) $(models_libs)
|
||||
libQFmodels_sw_la_SOURCES= $(models_sources) sw_skin.c
|
||||
libQFmodels_sw_la_DEPENDENCIES= $(sw_LIBS) $(models_libs)
|
||||
sprite/libsprite_sw.la \
|
||||
$(common_libs)
|
||||
libQFmodels_sw_la_LDFLAGS= $(lib_ldflags)
|
||||
libQFmodels_sw_la_LIBADD= $(sw_libs)
|
||||
libQFmodels_sw_la_DEPENDENCIES= $(sw_libs)
|
||||
libQFmodels_sw_la_SOURCES= $(models_sources) sw_skin.c
|
||||
|
|
|
|||
|
|
@ -5,16 +5,20 @@ INCLUDES= -I$(srcdir) -I$(top_srcdir)/include
|
|||
check_PROGRAMS=testclip testcontents testportals
|
||||
EXTRA_DIST= trace-id.c trace-qf-bad.c hulls.h main.c
|
||||
|
||||
testclip_SOURCES=testclip.c hulls.c
|
||||
testclip_LDADD= $(top_builddir)/libs/models/libQFmodels.la $(top_builddir)/libs/util/libQFutil.la
|
||||
testclip_DEPENDENCIES= $(top_builddir)/libs/models/libQFmodels.la $(top_builddir)/libs/util/libQFutil.la
|
||||
test_libs= \
|
||||
$(top_builddir)/libs/models/libQFmodels.la \
|
||||
$(top_builddir)/libs/util/libQFutil.la
|
||||
|
||||
testcontents_SOURCES=testcontents.c hulls.c
|
||||
testcontents_LDADD= $(top_builddir)/libs/models/libQFmodels.la $(top_builddir)/libs/util/libQFutil.la
|
||||
testcontents_DEPENDENCIES= $(top_builddir)/libs/models/libQFmodels.la $(top_builddir)/libs/util/libQFutil.la
|
||||
testclip_SOURCES= testclip.c hulls.c
|
||||
testclip_LDADD= $(test_libs)
|
||||
testclip_DEPENDENCIES= $(test_libs)
|
||||
|
||||
testportals_SOURCES=testportals.c hulls.c
|
||||
testportals_LDADD= $(top_builddir)/libs/models/libQFmodels.la $(top_builddir)/libs/util/libQFutil.la
|
||||
testportals_DEPENDENCIES= $(top_builddir)/libs/models/libQFmodels.la $(top_builddir)/libs/util/libQFutil.la
|
||||
testcontents_SOURCES= testcontents.c hulls.c
|
||||
testcontents_LDADD= $(test_libs)
|
||||
testcontents_DEPENDENCIES= $(test_libs)
|
||||
|
||||
testportals_SOURCES= testportals.c hulls.c
|
||||
testportals_LDADD= $(test_libs)
|
||||
testportals_DEPENDENCIES= $(test_libs)
|
||||
|
||||
TESTS=$(check_PROGRAMS)
|
||||
|
|
|
|||
|
|
@ -6,12 +6,14 @@ INCLUDES= -I$(top_srcdir)/include
|
|||
|
||||
noinst_LTLIBRARIES= libnet_chan.la libnet_main.la
|
||||
|
||||
libnet_chan_la_LIBADD= nc/libnc.la
|
||||
nc_libs=nc/libnc.la
|
||||
libnet_chan_la_LDFLAGS= @STATIC@
|
||||
libnet_chan_la_LIBADD= $(nc_libs)
|
||||
libnet_chan_la_DEPENDENCIES=$(nc_libs)
|
||||
libnet_chan_la_SOURCES= net_chan.c
|
||||
libnet_chan_la_DEPENDENCIES= nc/libnc.la
|
||||
|
||||
libnet_main_la_LIBADD= nm/libnm.la
|
||||
nm_libs=nm/libnm.la
|
||||
libnet_main_la_LDFLAGS= @STATIC@
|
||||
libnet_main_la_LIBADD= $(nm_libs)
|
||||
libnet_main_la_DEPENDENCIES=$(nm_libs)
|
||||
libnet_main_la_SOURCES= net_main.c
|
||||
libnet_main_la_DEPENDENCIES= nm/libnm.la
|
||||
|
|
|
|||
|
|
@ -2,10 +2,15 @@ AUTOMAKE_OPTIONS= foreign
|
|||
AM_CFLAGS= @PREFER_PIC@
|
||||
INCLUDES= -I$(top_srcdir)/include
|
||||
|
||||
lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
|
||||
-rpath $(libdir) -no-undefined
|
||||
object_libs=$(top_builddir)/libs/util/libQFutil.la
|
||||
|
||||
lib_LTLIBRARIES= libQFobject.la
|
||||
|
||||
libQFobject_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -no-undefined
|
||||
libQFobject_la_LIBADD= $(top_builddir)/libs/util/libQFutil.la
|
||||
libQFobject_la_LDFLAGS= $(lib_ldflags)
|
||||
libQFobject_la_LIBADD= $(object_libs)
|
||||
libQFobject_la_DEPENDENCIES=$(object_libs)
|
||||
libQFobject_la_SOURCES= \
|
||||
ArrayList.c Collection.c Double.c Integer.c Iterator.c \
|
||||
List.c Number.c Selector.c String.c garbage.c object.c
|
||||
|
|
|
|||
|
|
@ -3,10 +3,18 @@ AUTOMAKE_OPTIONS= foreign
|
|||
AM_CFLAGS= @PREFER_PIC@
|
||||
INCLUDES= -I$(top_srcdir)/include
|
||||
|
||||
lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
|
||||
-rpath $(libdir) -no-undefined
|
||||
rua_libs= \
|
||||
$(top_builddir)/libs/gamecode/libQFgamecode.la \
|
||||
$(top_builddir)/libs/gib/libQFgib.la \
|
||||
$(top_builddir)/libs/util/libQFutil.la
|
||||
|
||||
lib_LTLIBRARIES= libQFruamoko.la
|
||||
|
||||
libQFruamoko_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -no-undefined
|
||||
libQFruamoko_la_LIBADD= $(top_builddir)/libs/gamecode/libQFgamecode.la $(top_builddir)/libs/gib/libQFgib.la $(top_builddir)/libs/util/libQFutil.la
|
||||
libQFruamoko_la_LDFLAGS= $(lib_ldflags)
|
||||
libQFruamoko_la_LIBADD= $(rua_libs)
|
||||
libQFruamoko_la_DEPENDENCIES= $(rua_libs)
|
||||
libQFruamoko_la_SOURCES= \
|
||||
bi_gib.c pr_cmds.c \
|
||||
rua_cbuf.c rua_cmd.c rua_cvar.c rua_file.c rua_hash.c rua_init.c \
|
||||
|
|
|
|||
|
|
@ -8,6 +8,9 @@ INCLUDES= -I$(top_srcdir)/include
|
|||
|
||||
lib_LTLIBRARIES= libQFutil.la
|
||||
|
||||
lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
|
||||
-rpath $(libdir) -no-undefined
|
||||
|
||||
if ASM_ARCH
|
||||
asm= libasm.la
|
||||
else
|
||||
|
|
@ -34,7 +37,7 @@ else
|
|||
getopt=
|
||||
endif
|
||||
|
||||
libQFutil_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -no-undefined
|
||||
libQFutil_la_LDFLAGS= $(lib_ldflags)
|
||||
libQFutil_la_LIBADD= $(asm) $(Z_LIBS) $(DL_LIBS) $(WIN32_LIBS)
|
||||
libQFutil_la_DEPENDENCIES= $(asm)
|
||||
libQFutil_la_SOURCES= \
|
||||
|
|
|
|||
|
|
@ -3,6 +3,9 @@ AUTOMAKE_OPTIONS= foreign
|
|||
SUBDIRS= gl glsl sw sw32
|
||||
INCLUDES= -I$(top_srcdir)/include
|
||||
|
||||
lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
|
||||
-rpath $(libdir) -no-undefined
|
||||
|
||||
lib_LTLIBRARIES= @VID_REND_TARGETS@
|
||||
noinst_LTLIBRARIES= @VID_REND_NOINST_TARGETS@
|
||||
|
||||
|
|
@ -14,22 +17,22 @@ common_sources= \
|
|||
r_efrag.c r_ent.c r_graph.c r_light.c r_main.c r_part.c r_progs.c \
|
||||
r_screen.c
|
||||
|
||||
libQFrenderer_gl_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir)
|
||||
libQFrenderer_gl_la_LDFLAGS= $(lib_ldflags)
|
||||
libQFrenderer_gl_la_LIBADD= gl/libgl.la
|
||||
libQFrenderer_gl_la_SOURCES= $(common_sources)
|
||||
libQFrenderer_gl_la_DEPENDENCIES= gl/libgl.la
|
||||
libQFrenderer_gl_la_SOURCES= $(common_sources)
|
||||
|
||||
libQFrenderer_glsl_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir)
|
||||
libQFrenderer_glsl_la_LDFLAGS= $(lib_ldflags)
|
||||
libQFrenderer_glsl_la_LIBADD= glsl/libglsl.la
|
||||
libQFrenderer_glsl_la_SOURCES= $(common_sources)
|
||||
libQFrenderer_glsl_la_DEPENDENCIES= glsl/libglsl.la
|
||||
libQFrenderer_glsl_la_SOURCES= $(common_sources)
|
||||
|
||||
libQFrenderer_sw_la_LDFLAGS= @STATIC@
|
||||
libQFrenderer_sw_la_LIBADD= sw/libsw.la
|
||||
libQFrenderer_sw_la_SOURCES= $(common_sources)
|
||||
libQFrenderer_sw_la_DEPENDENCIES= sw/libsw.la
|
||||
libQFrenderer_sw_la_SOURCES= $(common_sources)
|
||||
|
||||
libQFrenderer_sw32_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir)
|
||||
libQFrenderer_sw32_la_LDFLAGS= $(lib_ldflags)
|
||||
libQFrenderer_sw32_la_LIBADD= sw32/libsw32.la
|
||||
libQFrenderer_sw32_la_SOURCES= $(common_sources)
|
||||
libQFrenderer_sw32_la_DEPENDENCIES= sw32/libsw32.la
|
||||
libQFrenderer_sw32_la_SOURCES= $(common_sources)
|
||||
|
|
|
|||
|
|
@ -2,6 +2,9 @@ AUTOMAKE_OPTIONS= foreign
|
|||
|
||||
INCLUDES= -I$(top_srcdir)/include
|
||||
|
||||
lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
|
||||
-rpath $(libdir) -no-undefined
|
||||
|
||||
if ASM_ARCH
|
||||
asm= libvid_asm.la
|
||||
else
|
||||
|
|
@ -34,7 +37,11 @@ joy_src= $(joy_null_src)
|
|||
endif
|
||||
endif
|
||||
|
||||
libQFjs_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir)
|
||||
js_libs=$(top_builddir)/libs/util/libQFutil.la
|
||||
|
||||
libQFjs_la_LDFLAGS= $(lib_ldflags)
|
||||
libQFjs_la_LIBADD= $(js_libs)
|
||||
libQFjs_la_DEPENDENCIES=$(js_libs)
|
||||
libQFjs_la_CFLAGS= @PREFER_PIC@ $(JOY_CFLAGS)
|
||||
libQFjs_la_SOURCES= joy.c $(joy_src)
|
||||
EXTRA_libQFjs_la_SOURCES= $(joy_linux_src) $(joy_win_src) $(joy_null_src)
|
||||
|
|
@ -80,87 +87,97 @@ fbdev_h= fbset_modes_y.h
|
|||
YFLAGS = -d
|
||||
YACCLEX_CLEANFILES= $(fbdev_c) $(fbdev_h)
|
||||
|
||||
fbdev_libs=libvid_common.la libvid_sw.la
|
||||
libQFfbdev_la_CFLAGS= @PREFER_NON_PIC@
|
||||
libQFfbdev_la_SOURCES= fbset.c fbset_modes_y.y fbset_modes_l.l \
|
||||
in_fbdev.c vid_fbdev.c
|
||||
libQFfbdev_la_LDFLAGS= @STATIC@
|
||||
libQFfbdev_la_LIBADD= libvid_common.la libvid_sw.la
|
||||
libQFfbdev_la_DEPENDENCIES= libvid_common.la libvid_sw.la
|
||||
libQFfbdev_la_LIBADD= $(fbdev_libs)
|
||||
libQFfbdev_la_DEPENDENCIES= $(fbdev_libs)
|
||||
|
||||
#
|
||||
# OpenGL in X Window
|
||||
#
|
||||
glx_libs=libvid_common.la libvid_gl.la libvid_x11.la
|
||||
libQFglx_la_CFLAGS= @PREFER_NON_PIC@ $(X_CFLAGS)
|
||||
libQFglx_la_SOURCES= vid_glx.c
|
||||
libQFglx_la_LDFLAGS= @STATIC@
|
||||
libQFglx_la_LIBADD= libvid_common.la libvid_gl.la libvid_x11.la
|
||||
libQFglx_la_DEPENDENCIES= libvid_common.la libvid_gl.la libvid_x11.la
|
||||
libQFglx_la_LIBADD= $(glx_libs)
|
||||
libQFglx_la_DEPENDENCIES= $(glx_libs)
|
||||
|
||||
#
|
||||
# OpenGL in X Window
|
||||
#
|
||||
glslx_libs=libvid_common.la libvid_glsl.la libvid_x11.la
|
||||
libQFglslx_la_CFLAGS= @PREFER_NON_PIC@ $(X_CFLAGS)
|
||||
libQFglslx_la_SOURCES= vid_glx.c
|
||||
libQFglslx_la_LDFLAGS= @STATIC@
|
||||
libQFglslx_la_LIBADD= libvid_common.la libvid_glsl.la libvid_x11.la
|
||||
libQFglslx_la_DEPENDENCIES= libvid_common.la libvid_glsl.la libvid_x11.la
|
||||
libQFglslx_la_LIBADD= $(glslx_libs)
|
||||
libQFglslx_la_DEPENDENCIES= $(glslx_libs)
|
||||
|
||||
#
|
||||
# Simple DirectMedia Library
|
||||
#
|
||||
sdl_libs=libvid_common.la libvid_sw.la libvid_sdl.la
|
||||
libQFsdl_la_CFLAGS= @PREFER_NON_PIC@ $(SDL_CFLAGS)
|
||||
libQFsdl_la_SOURCES= vid_sdl.c
|
||||
libQFsdl_la_LDFLAGS= @STATIC@
|
||||
libQFsdl_la_LIBADD= libvid_common.la libvid_sw.la libvid_sdl.la
|
||||
libQFsdl_la_DEPENDENCIES= libvid_common.la libvid_sw.la libvid_sdl.la
|
||||
libQFsdl_la_LIBADD= $(sdl_libs)
|
||||
libQFsdl_la_DEPENDENCIES= $(sdl_libs)
|
||||
|
||||
sdl32_libs=libvid_common.la libvid_sw32.la libvid_sdl.la
|
||||
libQFsdl32_la_CFLAGS= @PREFER_NON_PIC@ $(SDL_CFLAGS)
|
||||
libQFsdl32_la_SOURCES= vid_sdl32.c
|
||||
libQFsdl32_la_LDFLAGS= @STATIC@
|
||||
libQFsdl32_la_LIBADD= libvid_common.la libvid_sw32.la libvid_sdl.la
|
||||
libQFsdl32_la_DEPENDENCIES= libvid_common.la libvid_sw32.la libvid_sdl.la
|
||||
libQFsdl32_la_LIBADD= $(sdl32_libs)
|
||||
libQFsdl32_la_DEPENDENCIES= $(sdl32_libs)
|
||||
|
||||
sgl_libs=libvid_common.la libvid_gl.la libvid_sdl.la
|
||||
libQFsgl_la_CFLAGS= @PREFER_NON_PIC@ $(SDL_CFLAGS)
|
||||
libQFsgl_la_SOURCES= vid_sgl.c
|
||||
libQFsgl_la_LDFLAGS= @STATIC@
|
||||
libQFsgl_la_LIBADD= libvid_common.la libvid_gl.la libvid_sdl.la
|
||||
libQFsgl_la_DEPENDENCIES= libvid_common.la libvid_gl.la libvid_sdl.la
|
||||
libQFsgl_la_LIBADD= $(sgl_libs)
|
||||
libQFsgl_la_DEPENDENCIES= $(sgl_libs)
|
||||
|
||||
#
|
||||
# SVGAlib
|
||||
#
|
||||
svga_libs=$(asm) libvid_common.la libvid_sw.la libvid_svga.la
|
||||
libQFsvga_la_CFLAGS= @PREFER_NON_PIC@ $(SVGA_CFLAGS)
|
||||
libQFsvga_la_SOURCES= vid_svgalib.c
|
||||
libQFsvga_la_LDFLAGS= @STATIC@
|
||||
libQFsvga_la_LIBADD= $(asm) libvid_common.la libvid_sw.la libvid_svga.la
|
||||
libQFsvga_la_DEPENDENCIES= $(asm) libvid_common.la libvid_sw.la libvid_svga.la
|
||||
libQFsvga_la_LIBADD= $(svga_libs)
|
||||
libQFsvga_la_DEPENDENCIES= $(svga_libs)
|
||||
|
||||
#
|
||||
# 3dfx
|
||||
#
|
||||
tdfx_libs=$(asm) libvid_common.la libvid_gl.la libvid_svga.la
|
||||
libQFtdfx_la_CFLAGS= @PREFER_NON_PIC@ $(SVGA_CFLAGS)
|
||||
libQFtdfx_la_SOURCES= vid_3dfxsvga.c
|
||||
libQFtdfx_la_LDFLAGS= @STATIC@
|
||||
libQFtdfx_la_LIBADD= $(asm) libvid_common.la libvid_gl.la libvid_svga.la
|
||||
libQFtdfx_la_DEPENDENCIES= $(asm) libvid_common.la libvid_gl.la libvid_svga.la
|
||||
libQFtdfx_la_LIBADD= $(tdfx_libs)
|
||||
libQFtdfx_la_DEPENDENCIES= $(tdfx_libs)
|
||||
|
||||
#
|
||||
# OpenGL in Win32
|
||||
#
|
||||
wgl_libs=libvid_common.la libvid_gl.la
|
||||
libQFwgl_la_CFLAGS= @PREFER_NON_PIC@ $(WGL_CFLAGS)
|
||||
libQFwgl_la_SOURCES= in_win.c vid_wgl.c
|
||||
libQFwgl_la_LDFLAGS= @STATIC@
|
||||
libQFwgl_la_LIBADD= libvid_common.la libvid_gl.la
|
||||
libQFwgl_la_DEPENDENCIES= libvid_common.la libvid_gl.la
|
||||
libQFwgl_la_LIBADD= $(wgl_libs)
|
||||
libQFwgl_la_DEPENDENCIES= $(wgl_libs)
|
||||
|
||||
#
|
||||
# X11 software rendering
|
||||
#
|
||||
x11_libs=libvid_common.la libvid_sw.la libvid_x11.la
|
||||
libQFx11_la_CFLAGS= @PREFER_NON_PIC@ $(X_CFLAGS)
|
||||
libQFx11_la_SOURCES= vid_x11.c
|
||||
libQFx11_la_LDFLAGS= @STATIC@
|
||||
libQFx11_la_LIBADD= libvid_common.la libvid_sw.la libvid_x11.la
|
||||
libQFx11_la_DEPENDENCIES= libvid_common.la libvid_sw.la libvid_x11.la
|
||||
libQFx11_la_LIBADD= $(x11_libs)
|
||||
libQFx11_la_DEPENDENCIES= $(x11_libs)
|
||||
|
||||
# Kill the temp files, hopefully.
|
||||
CLEANFILES = *.i *.s $(YACCLEX_CLEANFILES)
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ EXTRA_DIST=sv_sys_win.c sv_sys_unix.c
|
|||
libqw_server_a_SOURCES= \
|
||||
crudefile.c sv_ccmds.c sv_demo.c sv_ents.c sv_gib.c sv_init.c sv_main.c \
|
||||
sv_move.c sv_phys.c sv_pr_cmds.c sv_pr_cpqw.c sv_pr_qwe.c sv_progs.c \
|
||||
sv_qtv.c sv_recorder.c sv_sbar.c sv_send.c sv_user.c world.c $(syssv_SRC)
|
||||
sv_qtv.c sv_recorder.c sv_sbar.c sv_send.c sv_user.c world.c
|
||||
|
||||
qw_server_LIBS= \
|
||||
$(SERVER_PLUGIN_STATIC_LIBS) \
|
||||
|
|
@ -79,14 +79,17 @@ qw_server_LIBS= \
|
|||
$(top_builddir)/libs/gib/libQFgib.la \
|
||||
$(top_builddir)/libs/util/libQFutil.la
|
||||
|
||||
qw_server_SOURCES=
|
||||
qw_server_LDADD= libqw_server.a libqw_common.a $(qw_server_LIBS) $(NET_LIBS) $(DL_LIBS) $(CURSES_LIBS)
|
||||
qw_server_LDFLAGS= $(common_ldflags)
|
||||
qw_server_DEPENDENCIES= libqw_common.a libqw_server.a $(qw_server_LIBS)
|
||||
qw_server_deps=libqw_server.a libqw_common.a $(qw_server_LIBS)
|
||||
qw_server_SOURCES= $(syssv_SRC)
|
||||
qw_server_LDADD= $(qw_server_deps) $(NET_LIBS) $(DL_LIBS) $(CURSES_LIBS)
|
||||
qw_server_LDFLAGS= $(common_ldflags)
|
||||
qw_server_DEPENDENCIES= $(qw_server_deps)
|
||||
|
||||
qw_master_SOURCES= master.c
|
||||
qw_master_LDADD= $(top_builddir)/libs/util/libQFutil.la $(NET_LIBS)
|
||||
qw_master_LDFLAGS= $(common_ldflags)
|
||||
qw_master_deps=$(top_builddir)/libs/util/libQFutil.la
|
||||
qw_master_SOURCES= master.c
|
||||
qw_master_LDADD= $(qw_master_deps) $(NET_LIBS)
|
||||
qw_master_DEPENDENCIES= $(qw_master_deps) $(NET_LIBS)
|
||||
qw_master_LDFLAGS= $(common_ldflags)
|
||||
|
||||
cl_plugin_LIBS= \
|
||||
$(CLIENT_PLUGIN_STATIC_LIBS) \
|
||||
|
|
|
|||
|
|
@ -28,9 +28,6 @@ AUTOMAKE_OPTIONS= foreign
|
|||
|
||||
SUBDIRS= include source doc
|
||||
|
||||
# uncomment the following if qfcc requires the math library
|
||||
#qfcc_LDADD=-lm
|
||||
|
||||
dist-zip: distdir
|
||||
-chmod -R a+r $(distdir)
|
||||
ZIP="-r9q" zip $(distdir).zip $(NOCONV_DIST)
|
||||
|
|
|
|||
Loading…
Reference in a new issue