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

Link QFgamecode directly into QFruamoko.

Browse source 
First step in the library "merge down".

QFgamecode is now a convenience library. The only things that mention it
directly now are ruamoko and qfcc.
This commit is contained in:
Bill Currie 2012-02-13 15:05:31 +09:00
parent 9a91aff93c
commit 3cb4cb59b5
9 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config.d/build_control.m4
View file

@ -465,14 +465,13 @@ QF_DEPS(QFVIS,
QF_DEPS(QWAQ,
[],
[$(top_builddir)/libs/ruamoko/libQFruamoko.la
$(top_builddir)/libs/gamecode/libQFgamecode.la
$(top_builddir)/libs/util/libQFutil.la],
[$(WIN32_LIBS)],
)
QF_DEPS(CARNE,
[],
[$(top_builddir)/libs/gib/libQFgib.la
$(top_builddir)/libs/gamecode/libQFgamecode.la
$(top_builddir)/libs/ruamoko/libQFruamoko.la
$(top_builddir)/libs/util/libQFutil.la],
[$(WIN32_LIBS)],
)

6
libs/Makefile.am
View file

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

2
libs/audio/Makefile.am
View file

@ -59,7 +59,7 @@ cd_xmms_la_SOURCES= cd_xmms.c
sound_libs= \
@snd_output_static_plugin_libs@ \
@snd_render_static_plugin_libs@ \
$(top_builddir)/libs/gamecode/libQFgamecode.la \
$(top_builddir)/libs/ruamoko/libQFruamoko.la \
$(top_builddir)/libs/util/libQFutil.la
cd_libs= \

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

@ -8,8 +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/ruamoko/libQFruamoko.la \
$(top_builddir)/libs/util/libQFutil.la
testsound_SOURCES= testsound.c

2
libs/console/Makefile.am
View file

@ -23,7 +23,7 @@ client_deps= libQFconsole.la \
$(top_builddir)/libs/audio/libQFsound.la \
$(top_builddir)/libs/ruamoko/libQFruamoko.la \
$(top_builddir)/libs/gib/libQFgib.la \
$(top_builddir)/libs/gamecode/libQFgamecode.la \
$(top_builddir)/libs/ruamoko/libQFruamoko.la \
$(console_deps)
server_deps= libQFconsole.la $(console_deps)

5
libs/gamecode/Makefile.am
View file

@ -2,12 +2,11 @@ AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_PIC@
INCLUDES= -I$(top_srcdir)/include
lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-rpath $(libdir) -no-undefined
lib_ldflags=
gc_deps=$(top_builddir)/libs/util/libQFutil.la
lib_LTLIBRARIES= libQFgamecode.la
noinst_LTLIBRARIES= libQFgamecode.la
libQFgamecode_la_LDFLAGS= $(lib_ldflags)
libQFgamecode_la_LIBADD= $(gc_deps)

2
libs/gib/Makefile.am
View file

@ -6,7 +6,7 @@ lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-rpath $(libdir) -no-undefined
gib_deps= \
$(top_builddir)/libs/gamecode/libQFgamecode.la \
$(top_builddir)/libs/ruamoko/libQFruamoko.la \
$(top_builddir)/libs/util/libQFutil.la
lib_LTLIBRARIES= libQFgib.la

1
nq/source/Makefile.am
View file

@ -67,7 +67,6 @@ common_LIBFILES= \
$(top_builddir)/libs/image/libQFimage.la \
$(top_builddir)/libs/gib/libQFgib.la \
$(top_builddir)/libs/ruamoko/libQFruamoko.la \
$(top_builddir)/libs/gamecode/libQFgamecode.la \
$(top_builddir)/libs/util/libQFutil.la
client_LIBS= $(client_LIBFILES) $(common_LIBFILES)

14
qw/source/Makefile.am
View file

@ -72,12 +72,11 @@ qw_server_LIBS= \
@server_static_plugin_libs@ \
$(top_builddir)/libs/qw/libqw.a \
$(top_builddir)/libs/net/libnet_chan.la \
$(top_builddir)/libs/ruamoko/libQFruamoko.la \
$(top_builddir)/libs/models/libQFmodels.la \
$(top_builddir)/libs/image/libQFimage.la \
$(top_builddir)/libs/gamecode/libQFgamecode.la \
$(top_builddir)/libs/console/libQFconsole.la \
$(top_builddir)/libs/gib/libQFgib.la \
$(top_builddir)/libs/ruamoko/libQFruamoko.la \
$(top_builddir)/libs/console/libQFconsole.la \
$(top_builddir)/libs/util/libQFutil.la
qw_server_deps=libqw_server.a libqw_common.a $(qw_server_LIBS)
@ -93,20 +92,19 @@ qw_master_DEPENDENCIES= $(qw_master_deps)
qw_master_LDFLAGS= $(common_ldflags)
cl_plugin_LIBS= \
@client_static_plugin_libs@ \
$(top_builddir)/libs/ruamoko/libQFruamoko.la
@client_static_plugin_libs@
qw_client_LIBS= \
$(top_builddir)/libs/qw/libqw.a \
$(top_builddir)/libs/net/libnet_chan.la \
$(top_builddir)/libs/console/libQFconsole.la \
$(top_builddir)/libs/video/targets/libQFjs.la \
$(top_builddir)/libs/gamecode/libQFgamecode.la \
$(top_builddir)/libs/audio/libQFcd.la \
$(top_builddir)/libs/audio/libQFsound.la \
$(top_builddir)/libs/image/libQFimage.la \
$(top_builddir)/libs/util/libQFutil.la \
$(top_builddir)/libs/gib/libQFgib.la
$(top_builddir)/libs/gib/libQFgib.la \
$(top_builddir)/libs/ruamoko/libQFruamoko.la \
$(top_builddir)/libs/util/libQFutil.la
client_LIBS= $(qw_client_LIBS)
client_libs= libqw_client.a libqw_common.a