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

Move bi_gib.c from ruamoko to gib.

Browse source 
This makes gib depend on gamecode, but removes the dependency on gib from
ruamoko. Unfortunately, carne now needs to be linked against gamecode even
though it never uses it.
This commit is contained in:
Bill Currie 2012-02-09 09:56:46 +09:00
parent da4fb6178c
commit 7a8f91edda
7 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config.d/build_control.m4
View file

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

5
libs/Makefile.am
View file

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

5
libs/gib/Makefile.am
View file

@ -5,7 +5,9 @@ INCLUDES= -I$(top_srcdir)/include
lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \ lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-rpath $(libdir) -no-undefined -rpath $(libdir) -no-undefined
gib_deps=$(top_builddir)/libs/util/libQFutil.la gib_deps= \
$(top_builddir)/libs/gamecode/libQFgamecode.la \
$(top_builddir)/libs/util/libQFutil.la
lib_LTLIBRARIES= libQFgib.la lib_LTLIBRARIES= libQFgib.la
@ -13,6 +15,7 @@ libQFgib_la_LDFLAGS= $(lib_ldflags)
libQFgib_la_LIBADD= $(gib_deps) libQFgib_la_LIBADD= $(gib_deps)
libQFgib_la_DEPENDENCIES= $(gib_deps) libQFgib_la_DEPENDENCIES= $(gib_deps)
libQFgib_la_SOURCES= \ libQFgib_la_SOURCES= \
bi_gib.c \
gib_buffer.c gib_builtin.c gib_classes.c gib_execute.c gib_function.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_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_thread.c gib_vars.c gib_init.c gib_tree.c \

0
libs/ruamoko/bi_gib.c → libs/gib/bi_gib.c
View file

10
libs/gib/gib_init.c
View file

@ -32,9 +32,7 @@
# include "config.h" # include "config.h"
#endif #endif
static __attribute__ ((used)) static __attribute__ ((used)) const char rcsid[] = "$Id$";
const char rcsid[] =
"$Id$";
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@ -56,6 +54,12 @@ const char rcsid[] =
#include "gib_handle.h" #include "gib_handle.h"
#include "gib_object.h" #include "gib_object.h"
#include "QF/csqc.h"
#define U __attribute__ ((used))
static U void (*const gib_progs_init)(struct progs_s *) = GIB_Progs_Init;
#undef U
static void static void
GIB_Exec_Override_f (void) GIB_Exec_Override_f (void)
{ {

3
libs/ruamoko/Makefile.am
View file

@ -7,7 +7,6 @@ lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-rpath $(libdir) -no-undefined -rpath $(libdir) -no-undefined
rua_libs= \ rua_libs= \
$(top_builddir)/libs/gamecode/libQFgamecode.la \ $(top_builddir)/libs/gamecode/libQFgamecode.la \
$(top_builddir)/libs/gib/libQFgib.la \
$(top_builddir)/libs/util/libQFutil.la $(top_builddir)/libs/util/libQFutil.la
lib_LTLIBRARIES= libQFruamoko.la lib_LTLIBRARIES= libQFruamoko.la
@ -16,7 +15,7 @@ libQFruamoko_la_LDFLAGS= $(lib_ldflags)
libQFruamoko_la_LIBADD= $(rua_libs) libQFruamoko_la_LIBADD= $(rua_libs)
libQFruamoko_la_DEPENDENCIES= $(rua_libs) libQFruamoko_la_DEPENDENCIES= $(rua_libs)
libQFruamoko_la_SOURCES= \ libQFruamoko_la_SOURCES= \
bi_gib.c pr_cmds.c \ pr_cmds.c \
rua_cbuf.c rua_cmd.c rua_cvar.c rua_file.c rua_hash.c rua_init.c \ rua_cbuf.c rua_cmd.c rua_cvar.c rua_file.c rua_hash.c rua_init.c \
rua_math.c rua_msgbuf.c rua_obj.c rua_plist.c rua_qfile.c rua_qfs.c \ rua_math.c rua_msgbuf.c rua_obj.c rua_plist.c rua_qfile.c rua_qfs.c \
rua_script.c rua_string.c rua_script.c rua_string.c

5
libs/ruamoko/pr_cmds.c
View file

@ -52,11 +52,6 @@ static __attribute__ ((used)) const char rcsid[] =
#include "compat.h" #include "compat.h"
#include "QF/csqc.h"
#define U __attribute__ ((used))
static U void (*const gib_progs_init)(progs_t *) = GIB_Progs_Init;
#undef U
VISIBLE const char *pr_gametype = ""; VISIBLE const char *pr_gametype = "";
/* BUILT-IN FUNCTIONS */ /* BUILT-IN FUNCTIONS */