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

[gamecode] Move progs auxiliary headers into a subdirectory

Browse source 
Just another step along the road of tidying up the QF include directory
(and desirable for generated data).
This commit is contained in:
Bill Currie 2022-01-09 00:26:52 +09:00
parent 63795e790b
commit 4111d44dcc
38 changed files with 61 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/QF/Makemodule.am
View file

@ -43,10 +43,6 @@ include_qf = \
include/QF/plist.h \
include/QF/plugin.h \
include/QF/pqueue.h \
include/QF/pr_comp.h \
include/QF/pr_debug.h \
include/QF/pr_obj.h \
include/QF/pr_type.h \
include/QF/progs.h \
include/QF/pvsfile.h \
include/QF/qargs.h \
@ -135,6 +131,12 @@ include_qf_plugin = \
include/QF/plugin/snd_render.h \
include/QF/plugin/vid_render.h
include_qf_progs = \
include/QF/pr_comp.h \
include/QF/pr_debug.h \
include/QF/pr_obj.h \
include/QF/pr_type.h
include_qf_scene = \
include/QF/scene/entity.h \
include/QF/scene/hierarchy.h \
@ -232,6 +234,7 @@ EXTRA_HEADERS += \
$(include_qf_input) \
$(include_qf_math) \
$(include_qf_plugin) \
$(include_qf_progs) \
$(include_qf_scene) \
$(include_qf_simd) \
$(include_qf_ui) \

4
include/QF/progs.h
View file

@ -33,8 +33,8 @@
\image latex vm-mem.eps "VM memory map"
*/
#include "QF/pr_comp.h"
#include "QF/pr_debug.h"
#include "QF/progs/pr_comp.h"
#include "QF/progs/pr_debug.h"
struct QFile_s;

0
include/QF/pr_comp.h → include/QF/progs/pr_comp.h
View file

2
include/QF/pr_debug.h → include/QF/progs/pr_debug.h
View file

@ -32,7 +32,7 @@
#define __QF_pr_debug_h
#ifndef __QFCC__
#include "QF/pr_comp.h"
#include "QF/progs/pr_comp.h"
typedef struct pr_compunit_s {
pr_uint_t unit_name;

4
include/QF/pr_obj.h → include/QF/progs/pr_obj.h
View file

@ -31,7 +31,7 @@
#ifndef __QF_pr_obj_h
#define __QF_pr_obj_h
#include "QF/pr_comp.h"
#include "QF/progs/pr_comp.h"
#define PR_BITS_PER_INT (sizeof (pr_int_t) * 8)
@ -74,7 +74,7 @@
#define PR_CLS_GETNUMBER(cls) (__CLS_INFO (cls) >> (PR_BITS_PER_INT / 2))
#define PR_CLS_SETNUMBER(cls, num) \
(__PR_CLS_INFO (cls) = __PR_CLS_INFO (cls) & (~0U >> (PR_BITS_PER_INT / 2)) \
| (num) << (PR_BITS_PER_INT / 2))
| (num) << (PR_BITS_PER_INT / 2))
typedef struct pr_sel_s {
pointer_t sel_id;

2
include/QF/pr_type.h → include/QF/progs/pr_type.h
View file

@ -38,7 +38,7 @@
*/
///@{
#include "QF/pr_comp.h"
#include "QF/progs/pr_comp.h"
typedef enum {
ty_basic, ///< VM type (float, int, pointer, field, etc)

2
include/QF/ruamoko.h
View file

@ -31,7 +31,7 @@
#ifndef __QF_ruamoko_h
#define __QF_ruamoko_h
#include "QF/pr_obj.h"
#include "QF/progs/pr_obj.h"
struct progs_s;
struct cbuf_s;

5
libs/gamecode/pr_debug.c
View file

@ -49,8 +49,6 @@
#include "QF/dstring.h"
#include "QF/hash.h"
#include "QF/mathlib.h"
#include "QF/pr_debug.h"
#include "QF/pr_type.h"
#include "QF/progs.h"
#include "QF/qendian.h"
#include "QF/quakefs.h"
@ -58,6 +56,9 @@
#include "QF/sys.h"
#include "QF/zone.h"
#include "QF/progs/pr_debug.h"
#include "QF/progs/pr_type.h"
#include "compat.h"
typedef struct {

3
libs/gamecode/pr_v6p_opcode.c
View file

@ -37,10 +37,11 @@
#endif
#include "QF/cvar.h"
#include "QF/pr_comp.h"
#include "QF/progs.h"
#include "QF/sys.h"
#include "QF/progs/pr_comp.h"
#include "compat.h"
VISIBLE const pr_ushort_t pr_type_size[ev_type_count] = {

3
libs/ruamoko/rua_obj.c
View file

@ -48,11 +48,12 @@
#include "QF/dstring.h"
#include "QF/hash.h"
#include "QF/mathlib.h"
#include "QF/pr_obj.h"
#include "QF/progs.h"
#include "QF/ruamoko.h"
#include "QF/sys.h"
#include "QF/progs/pr_obj.h"
#include "compat.h"
#include "rua_internal.h"

3
libs/ruamoko/rua_set.c
View file

@ -40,9 +40,10 @@
#include <stdlib.h>
#include "QF/progs.h"
#include "QF/pr_obj.h"
#include "QF/set.h"
#include "QF/progs/pr_obj.h"
#include "rua_internal.h"
typedef struct {

2
ruamoko/qwaq/debugger/debug.h
View file

@ -9,7 +9,7 @@ typedef enum {
#ifdef __QFCC__
#include <QF/pr_debug.h>
#include <QF/progs/pr_debug.h>
//FIXME finish unsigned in qfcc
#ifndef umax

2
ruamoko/qwaq/editor/editbuffer.h
View file

@ -77,7 +77,7 @@ typedef struct eb_color_s {
@end
#else//__QFCC__
#include "QF/pr_obj.h"
#include "QF/progs/pr_obj.h"
typedef struct qwaq_editbuffer_s {
pr_id_t isa;

2
ruamoko/qwaq/ui/textcontext.h
View file

@ -61,7 +61,7 @@
#else
#include "QF/pr_obj.h"
#include "QF/progs/pr_obj.h"
typedef struct qwaq_textcontext_s {
pr_id_t isa;

2
tools/qfcc/include/dags.h
View file

@ -35,7 +35,7 @@
*/
///@{
#include "QF/pr_comp.h"
#include "QF/progs/pr_comp.h"
#include "statements.h"

2
tools/qfcc/include/debug.h
View file

@ -31,7 +31,7 @@
#ifndef __debug_h
#define __debug_h
#include "QF/pr_debug.h"
#include "QF/progs/pr_debug.h"
void line_info (char *text);
pr_lineno_t *new_lineno (void);

4
tools/qfcc/include/def.h
View file

@ -31,8 +31,8 @@
#ifndef __def_h
#define __def_h
#include "QF/pr_comp.h"
#include "QF/pr_debug.h"
#include "QF/progs/pr_comp.h"
#include "QF/progs/pr_debug.h"
/** \defgroup qfcc_def Def handling
\ingroup qfcc

4
tools/qfcc/include/defspace.h
View file

@ -31,8 +31,8 @@
#ifndef __defspace_h
#define __defspace_h
#include "QF/pr_comp.h"
#include "QF/pr_debug.h"
#include "QF/progs/pr_comp.h"
#include "QF/progs/pr_debug.h"
/** \defgroup qfcc_defspace Defspace handling
\ingroup qfcc

2
tools/qfcc/include/diagnostic.h
View file

@ -31,8 +31,6 @@
#ifndef __diagnostic_h
#define __diagnostic_h
#include "QF/pr_comp.h"
/** \defgroup qfcc_diagnostic Diagnostic Messages
\ingroup qfcc
*/

2
tools/qfcc/include/expr.h
View file

@ -31,7 +31,7 @@
#ifndef __expr_h
#define __expr_h
#include "QF/pr_comp.h"
#include "QF/progs/pr_comp.h"
/** \defgroup qfcc_expr Expressions
\ingroup qfcc

4
tools/qfcc/include/function.h
View file

@ -36,8 +36,8 @@
*/
///@{
#include "QF/pr_comp.h"
#include "QF/pr_debug.h"
#include "QF/progs/pr_comp.h"
#include "QF/progs/pr_debug.h"
#include "def.h"

2
tools/qfcc/include/idstuff.h
View file

@ -31,7 +31,7 @@
#ifndef __idstuff_h
#define __idstuff_h
#include "QF/pr_comp.h"
#include "QF/progs/pr_comp.h"
//XXX eww :/
void PrecacheSound (const char *, int ch);

4
tools/qfcc/include/obj_file.h
View file

@ -36,8 +36,8 @@
*/
///@{
#include "QF/pr_comp.h"
#include "QF/pr_debug.h"
#include "QF/progs/pr_comp.h"
#include "QF/progs/pr_debug.h"
#include "QF/quakeio.h"
/** Identifier string for qfo object files (includes terminating nul)

2
tools/qfcc/include/obj_type.h
View file

@ -31,7 +31,7 @@
#ifndef __obj_type_h
#define __obj_type_h
#include "QF/pr_type.h"
#include "QF/progs/pr_type.h"
#include "type.h"

2
tools/qfcc/include/opcodes.h
View file

@ -31,7 +31,7 @@
#ifndef __opcodes_h
#define __opcodes_h
#include "QF/pr_comp.h"
#include "QF/progs/pr_comp.h"
typedef struct instruction_s instruction_t;

2
tools/qfcc/include/qfcc.h
View file

@ -35,7 +35,7 @@
#include <stdio.h>
#include "QF/darray.h"
#include "QF/pr_comp.h"
#include "QF/progs/pr_comp.h"
/** \defgroup qfcc_general General functions
\ingroup qfcc

2
tools/qfcc/include/statements.h
View file

@ -30,7 +30,7 @@
#ifndef statement_h
#define statement_h
#include "QF/pr_comp.h"
#include "QF/progs/pr_comp.h"
typedef enum {
op_def,

2
tools/qfcc/include/type.h
View file

@ -31,7 +31,7 @@
#ifndef __type_h
#define __type_h
#include "QF/pr_type.h"
#include "QF/progs/pr_type.h"
#include "def.h"

3
tools/qfcc/source/class.c
View file

@ -41,9 +41,10 @@
#include "QF/dstring.h"
#include "QF/hash.h"
#include "QF/pr_obj.h"
#include "QF/va.h"
#include "QF/progs/pr_obj.h"
#include "tools/qfcc/include/qfcc.h"
#include "tools/qfcc/include/codespace.h"

2
tools/qfcc/source/codespace.c
View file

@ -39,7 +39,7 @@
#endif
#include <stdlib.h>
#include "QF/pr_comp.h"
#include "QF/progs/pr_comp.h"
#include "tools/qfcc/include/codespace.h"

2
tools/qfcc/source/debug.c
View file

@ -41,7 +41,7 @@
#include <ctype.h>
#include "QF/alloc.h"
#include "QF/pr_comp.h"
#include "QF/progs/pr_comp.h"
#include "tools/qfcc/include/debug.h"
#include "tools/qfcc/include/def.h"

3
tools/qfcc/source/dump_lines.c
View file

@ -41,7 +41,8 @@
#include <stdlib.h>
#include "QF/progs.h"
#include "QF/pr_type.h"
#include "QF/progs/pr_type.h"
#include "tools/qfcc/include/obj_file.h"
#include "tools/qfcc/include/qfprogs.h"

3
tools/qfcc/source/dump_modules.c
View file

@ -40,10 +40,11 @@
#include <stdlib.h>
#include "QF/pr_obj.h"
#include "QF/progs.h"
#include "QF/va.h"
#include "QF/progs/pr_obj.h"
#include "tools/qfcc/include/qfprogs.h"
static void

3
tools/qfcc/source/method.c
View file

@ -41,9 +41,10 @@
#include "QF/dstring.h"
#include "QF/hash.h"
#include "QF/pr_obj.h"
#include "QF/va.h"
#include "QF/progs/pr_obj.h"
#include "tools/qfcc/include/qfcc.h"
#include "tools/qfcc/include/expr.h"

3
tools/qfcc/source/options.c
View file

@ -42,9 +42,10 @@
#include <getopt.h>
#include "QF/pr_comp.h"
#include "QF/va.h"
#include "QF/progs/pr_comp.h"
#include "tools/qfcc/include/cpp.h"
#include "tools/qfcc/include/linker.h"
#include "tools/qfcc/include/options.h"

3
tools/qfcc/source/pragma.c
View file

@ -40,7 +40,8 @@
#include <stdlib.h>
#include "QF/alloc.h"
#include "QF/pr_comp.h"
#include "QF/progs/pr_comp.h"
#include "tools/qfcc/include/diagnostic.h"
#include "tools/qfcc/include/opcodes.h"

3
tools/qfcc/source/qfprogs.c
View file

@ -56,13 +56,14 @@
#include "QF/cvar.h"
#include "QF/hash.h"
#include "QF/mathlib.h"
#include "QF/pr_comp.h"
#include "QF/progs.h"
#include "QF/quakeio.h"
#include "QF/sys.h"
#include "QF/va.h"
#include "QF/zone.h"
#include "QF/progs/pr_comp.h"
#include "tools/qfcc/include/obj_file.h"
#include "tools/qfcc/include/obj_type.h"
#include "tools/qfcc/include/qfprogs.h"

3
tools/qfcc/source/struct.c
View file

@ -43,10 +43,11 @@
#include <QF/dstring.h>
#include <QF/hash.h>
#include <QF/pr_obj.h>
#include <QF/sys.h>
#include <QF/va.h>
#include <QF/progs/pr_obj.h>
#include "tools/qfcc/include/class.h"
#include "tools/qfcc/include/def.h"
#include "tools/qfcc/include/defspace.h"