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

Disable libQFobject from being built or used, since it doesn't serve

Browse source 
any purpose right now.
This commit is contained in:
Brian Koropoff 2004-04-27 21:58:21 +00:00
parent 409ba9887f
commit c16194cf76
6 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -2182,7 +2182,6 @@ AC_OUTPUT(
libs/net/Makefile
libs/net/nc/Makefile
libs/net/nm/Makefile
libs/object/Makefile
libs/qw/Makefile
libs/ruamoko/Makefile
libs/util/Makefile

4
include/QF/Makefile.am
View file

@ -16,9 +16,5 @@ nobase_pkginclude_HEADERS = \
GL/qf_rlight.h GL/qf_rmain.h GL/qf_rsurf.h GL/qf_screen.h GL/qf_sky.h \
GL/qf_textures.h GL/qf_vid.h GL/types.h \
\
classes/ArrayList.h classes/Collection.h classes/Double.h \
classes/Exception.h classes/Integer.h classes/Iterator.h classes/List.h \
classes/Number.h classes/String.h \
\
plugin/cd.h plugin/console.h plugin/general.h plugin/input.h \
plugin/snd_output.h plugin/snd_render.h

15
include/QF/object.h
View file

@ -40,14 +40,14 @@
#ifdef __GNUC__
#define superInit(cl, obj, args...) (cl##_class->parent->init ((obj) , ## args))
#define new(cl, args...) ((void *) (cl##_class->abstract ? NULL : cl##_class->init (Object_Create(cl##_class, false), ## args)))
#define newFloat(cl, args...) ((void *) (cl##_class->abstract ? NULL : cl##_class->init (Object_Create(cl##_class, true) , ## args)))
#define new(cl, args...) ((void *) (cl##_class->init (Object_Create(cl##_class, false), ## args)))
#define newPerm(cl, args...) ((void *) (cl##_class->init (Object_Create(cl##_class, true) , ## args)))
#define methodCall(obj, m, args...) ((obj)->m(obj , ## args))
#define methodDecl(type, name, args...) (* name) (struct type##_s *self , ## args)
#else
#define superInit(cl, obj, ...) (cl##_class->parent->init ((obj), ##__VA_ARGS__))
#define new(cl, ...) ((void *) (cl##_class->abstract ? NULL : cl##_class->init (Object_Create(cl##_class, false) , ##__VA_ARGS__)))
#define newFloat(cl, ...) ((void *) (cl##_class->abstract ? NULL : cl##_class->init (Object_Create(cl##_class, true) , ##__VA_ARGS__)))
#define new(cl, ...) ((void *) (cl##_class->init (Object_Create(cl##_class, false) , ##__VA_ARGS__)))
#define newPerm(cl, ...) ((void *) (cl##_class->init (Object_Create(cl##_class, true) , ##__VA_ARGS__)))
#define methodCall(obj, m, ...) ((obj)->m(obj, ##__VA_ARGS__))
#define methodDecl(type, name, ...) (* name) (struct type##_s *self, ##__VA_ARGS__)
#endif
@ -76,6 +76,7 @@ typedef void (*ReplyHandler_t) (struct Object_s *retValue);
typedef struct Object_s {
unsigned marked :1;
unsigned finalized :1;
unsigned nogc :1;
struct Class_s *cl;
int refs;
struct Object_s *next;
@ -93,7 +94,8 @@ typedef Object *(*Object_Init_t) (Object *obj, ...);
typedef void (*Object_Deinit_t) (Object *obj);
classDecl (Class, Object,
qboolean abstract;
unsigned abstract :1;
unsigned alwaysperm :1;
unsigned int size;
const char *name;
struct Class_s *parent;
@ -102,7 +104,7 @@ classDecl (Class, Object,
);
#define CLASS(o) ((Class *)(o))
Object *Object_Create (Class *cl, qboolean floating);
Object *Object_Create (Class *cl, qboolean perm);
void Object_Delete (Object *obj);
Object *Object_Retain (Object *obj);
Object *Object_Release (Object *obj);
@ -112,7 +114,6 @@ void Object_RemoveFromRoot (Object *obj);
void Object_Init (void);
void Object_Garbage_Collect (void);
#include "QF/classes/List.h"
#include "QF/classes/String.h"
#endif

2
libs/Makefile.am
View file

@ -3,5 +3,5 @@ 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)
SUBDIRS=util audio console gib gamecode image models net object qw ruamoko \
SUBDIRS=util audio console gib gamecode image models net qw ruamoko \
video

1
qw/source/Makefile.am
View file

@ -82,7 +82,6 @@ qw_server_LIBS= \
$(top_builddir)/libs/gamecode/builtins/libQFgamecode_builtins.la \
$(top_builddir)/libs/gamecode/engine/libQFgamecode.la \
$(top_builddir)/libs/console/libQFconsole.la \
$(top_builddir)/libs/object/libQFobject.la \
$(top_builddir)/libs/gib/libQFgib.la \
$(top_builddir)/libs/util/libQFutil.la

1
qw/source/sv_main.c
View file

@ -71,7 +71,6 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "QF/dstring.h"
#include "QF/model.h"
#include "QF/msg.h"
#include "QF/object.h"
#include "QF/plugin.h"
#include "QF/qargs.h"
#include "QF/quakefs.h"