From 4111d44dcc646c306a6d70b277f27d685a8a8517 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sun, 9 Jan 2022 00:26:52 +0900 Subject: [PATCH] [gamecode] Move progs auxiliary headers into a subdirectory Just another step along the road of tidying up the QF include directory (and desirable for generated data). --- include/QF/Makemodule.am | 11 +++++++---- include/QF/progs.h | 4 ++-- include/QF/{ => progs}/pr_comp.h | 0 include/QF/{ => progs}/pr_debug.h | 2 +- include/QF/{ => progs}/pr_obj.h | 4 ++-- include/QF/{ => progs}/pr_type.h | 2 +- include/QF/ruamoko.h | 2 +- libs/gamecode/pr_debug.c | 5 +++-- libs/gamecode/pr_v6p_opcode.c | 3 ++- libs/ruamoko/rua_obj.c | 3 ++- libs/ruamoko/rua_set.c | 3 ++- ruamoko/qwaq/debugger/debug.h | 2 +- ruamoko/qwaq/editor/editbuffer.h | 2 +- ruamoko/qwaq/ui/textcontext.h | 2 +- tools/qfcc/include/dags.h | 2 +- tools/qfcc/include/debug.h | 2 +- tools/qfcc/include/def.h | 4 ++-- tools/qfcc/include/defspace.h | 4 ++-- tools/qfcc/include/diagnostic.h | 2 -- tools/qfcc/include/expr.h | 2 +- tools/qfcc/include/function.h | 4 ++-- tools/qfcc/include/idstuff.h | 2 +- tools/qfcc/include/obj_file.h | 4 ++-- tools/qfcc/include/obj_type.h | 2 +- tools/qfcc/include/opcodes.h | 2 +- tools/qfcc/include/qfcc.h | 2 +- tools/qfcc/include/statements.h | 2 +- tools/qfcc/include/type.h | 2 +- tools/qfcc/source/class.c | 3 ++- tools/qfcc/source/codespace.c | 2 +- tools/qfcc/source/debug.c | 2 +- tools/qfcc/source/dump_lines.c | 3 ++- tools/qfcc/source/dump_modules.c | 3 ++- tools/qfcc/source/method.c | 3 ++- tools/qfcc/source/options.c | 3 ++- tools/qfcc/source/pragma.c | 3 ++- tools/qfcc/source/qfprogs.c | 3 ++- tools/qfcc/source/struct.c | 3 ++- 38 files changed, 61 insertions(+), 48 deletions(-) rename include/QF/{ => progs}/pr_comp.h (100%) rename include/QF/{ => progs}/pr_debug.h (98%) rename include/QF/{ => progs}/pr_obj.h (98%) rename include/QF/{ => progs}/pr_type.h (99%) diff --git a/include/QF/Makemodule.am b/include/QF/Makemodule.am index 77f56e29b..4f5aa35c9 100644 --- a/include/QF/Makemodule.am +++ b/include/QF/Makemodule.am @@ -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) \ diff --git a/include/QF/progs.h b/include/QF/progs.h index c4b2ef070..572528891 100644 --- a/include/QF/progs.h +++ b/include/QF/progs.h @@ -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; diff --git a/include/QF/pr_comp.h b/include/QF/progs/pr_comp.h similarity index 100% rename from include/QF/pr_comp.h rename to include/QF/progs/pr_comp.h diff --git a/include/QF/pr_debug.h b/include/QF/progs/pr_debug.h similarity index 98% rename from include/QF/pr_debug.h rename to include/QF/progs/pr_debug.h index 94c164fe5..20b65c25c 100644 --- a/include/QF/pr_debug.h +++ b/include/QF/progs/pr_debug.h @@ -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; diff --git a/include/QF/pr_obj.h b/include/QF/progs/pr_obj.h similarity index 98% rename from include/QF/pr_obj.h rename to include/QF/progs/pr_obj.h index 52f05aa16..ea8f6a052 100644 --- a/include/QF/pr_obj.h +++ b/include/QF/progs/pr_obj.h @@ -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; diff --git a/include/QF/pr_type.h b/include/QF/progs/pr_type.h similarity index 99% rename from include/QF/pr_type.h rename to include/QF/progs/pr_type.h index 56915724b..04a3266f6 100644 --- a/include/QF/pr_type.h +++ b/include/QF/progs/pr_type.h @@ -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) diff --git a/include/QF/ruamoko.h b/include/QF/ruamoko.h index ba1531485..b6f82ff31 100644 --- a/include/QF/ruamoko.h +++ b/include/QF/ruamoko.h @@ -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; diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c index 98c5d0e59..b77dc940a 100644 --- a/libs/gamecode/pr_debug.c +++ b/libs/gamecode/pr_debug.c @@ -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 { diff --git a/libs/gamecode/pr_v6p_opcode.c b/libs/gamecode/pr_v6p_opcode.c index 421159648..5ded2c764 100644 --- a/libs/gamecode/pr_v6p_opcode.c +++ b/libs/gamecode/pr_v6p_opcode.c @@ -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] = { diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c index 4bed1de5d..aab7b4c0f 100644 --- a/libs/ruamoko/rua_obj.c +++ b/libs/ruamoko/rua_obj.c @@ -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" diff --git a/libs/ruamoko/rua_set.c b/libs/ruamoko/rua_set.c index 4e8b752b5..cc7ce9735 100644 --- a/libs/ruamoko/rua_set.c +++ b/libs/ruamoko/rua_set.c @@ -40,9 +40,10 @@ #include #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 { diff --git a/ruamoko/qwaq/debugger/debug.h b/ruamoko/qwaq/debugger/debug.h index 93ef60f3b..e9c1cedcf 100644 --- a/ruamoko/qwaq/debugger/debug.h +++ b/ruamoko/qwaq/debugger/debug.h @@ -9,7 +9,7 @@ typedef enum { #ifdef __QFCC__ -#include +#include //FIXME finish unsigned in qfcc #ifndef umax diff --git a/ruamoko/qwaq/editor/editbuffer.h b/ruamoko/qwaq/editor/editbuffer.h index fe8a15829..8d42c6038 100644 --- a/ruamoko/qwaq/editor/editbuffer.h +++ b/ruamoko/qwaq/editor/editbuffer.h @@ -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; diff --git a/ruamoko/qwaq/ui/textcontext.h b/ruamoko/qwaq/ui/textcontext.h index 21f21b5ae..d73a9895c 100644 --- a/ruamoko/qwaq/ui/textcontext.h +++ b/ruamoko/qwaq/ui/textcontext.h @@ -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; diff --git a/tools/qfcc/include/dags.h b/tools/qfcc/include/dags.h index 6addafcd2..66fbece40 100644 --- a/tools/qfcc/include/dags.h +++ b/tools/qfcc/include/dags.h @@ -35,7 +35,7 @@ */ ///@{ -#include "QF/pr_comp.h" +#include "QF/progs/pr_comp.h" #include "statements.h" diff --git a/tools/qfcc/include/debug.h b/tools/qfcc/include/debug.h index af5f322b7..6e7d6f477 100644 --- a/tools/qfcc/include/debug.h +++ b/tools/qfcc/include/debug.h @@ -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); diff --git a/tools/qfcc/include/def.h b/tools/qfcc/include/def.h index 691c5d602..c03b221ef 100644 --- a/tools/qfcc/include/def.h +++ b/tools/qfcc/include/def.h @@ -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 diff --git a/tools/qfcc/include/defspace.h b/tools/qfcc/include/defspace.h index e0414f1c9..6e839ce67 100644 --- a/tools/qfcc/include/defspace.h +++ b/tools/qfcc/include/defspace.h @@ -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 diff --git a/tools/qfcc/include/diagnostic.h b/tools/qfcc/include/diagnostic.h index 958b44d66..8adec809c 100644 --- a/tools/qfcc/include/diagnostic.h +++ b/tools/qfcc/include/diagnostic.h @@ -31,8 +31,6 @@ #ifndef __diagnostic_h #define __diagnostic_h -#include "QF/pr_comp.h" - /** \defgroup qfcc_diagnostic Diagnostic Messages \ingroup qfcc */ diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h index 47d382929..6293a8103 100644 --- a/tools/qfcc/include/expr.h +++ b/tools/qfcc/include/expr.h @@ -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 diff --git a/tools/qfcc/include/function.h b/tools/qfcc/include/function.h index 48a82f9e9..986f513eb 100644 --- a/tools/qfcc/include/function.h +++ b/tools/qfcc/include/function.h @@ -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" diff --git a/tools/qfcc/include/idstuff.h b/tools/qfcc/include/idstuff.h index 82ef617f8..2eadb691b 100644 --- a/tools/qfcc/include/idstuff.h +++ b/tools/qfcc/include/idstuff.h @@ -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); diff --git a/tools/qfcc/include/obj_file.h b/tools/qfcc/include/obj_file.h index f49688f0f..8d6c40a22 100644 --- a/tools/qfcc/include/obj_file.h +++ b/tools/qfcc/include/obj_file.h @@ -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) diff --git a/tools/qfcc/include/obj_type.h b/tools/qfcc/include/obj_type.h index a8c546703..c3d9cb6e7 100644 --- a/tools/qfcc/include/obj_type.h +++ b/tools/qfcc/include/obj_type.h @@ -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" diff --git a/tools/qfcc/include/opcodes.h b/tools/qfcc/include/opcodes.h index 2966235e6..fa100fb6b 100644 --- a/tools/qfcc/include/opcodes.h +++ b/tools/qfcc/include/opcodes.h @@ -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; diff --git a/tools/qfcc/include/qfcc.h b/tools/qfcc/include/qfcc.h index 9d552ab3e..4ac5e0ddb 100644 --- a/tools/qfcc/include/qfcc.h +++ b/tools/qfcc/include/qfcc.h @@ -35,7 +35,7 @@ #include #include "QF/darray.h" -#include "QF/pr_comp.h" +#include "QF/progs/pr_comp.h" /** \defgroup qfcc_general General functions \ingroup qfcc diff --git a/tools/qfcc/include/statements.h b/tools/qfcc/include/statements.h index bc15244c6..386dad198 100644 --- a/tools/qfcc/include/statements.h +++ b/tools/qfcc/include/statements.h @@ -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, diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h index ca079eb01..f985ea826 100644 --- a/tools/qfcc/include/type.h +++ b/tools/qfcc/include/type.h @@ -31,7 +31,7 @@ #ifndef __type_h #define __type_h -#include "QF/pr_type.h" +#include "QF/progs/pr_type.h" #include "def.h" diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c index dfaf638c8..7858f82fa 100644 --- a/tools/qfcc/source/class.c +++ b/tools/qfcc/source/class.c @@ -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" diff --git a/tools/qfcc/source/codespace.c b/tools/qfcc/source/codespace.c index b7cd56bcc..5d6aee439 100644 --- a/tools/qfcc/source/codespace.c +++ b/tools/qfcc/source/codespace.c @@ -39,7 +39,7 @@ #endif #include -#include "QF/pr_comp.h" +#include "QF/progs/pr_comp.h" #include "tools/qfcc/include/codespace.h" diff --git a/tools/qfcc/source/debug.c b/tools/qfcc/source/debug.c index ec0367fa0..644ee31d9 100644 --- a/tools/qfcc/source/debug.c +++ b/tools/qfcc/source/debug.c @@ -41,7 +41,7 @@ #include #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" diff --git a/tools/qfcc/source/dump_lines.c b/tools/qfcc/source/dump_lines.c index bfaffdc6e..7ff66fabb 100644 --- a/tools/qfcc/source/dump_lines.c +++ b/tools/qfcc/source/dump_lines.c @@ -41,7 +41,8 @@ #include #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" diff --git a/tools/qfcc/source/dump_modules.c b/tools/qfcc/source/dump_modules.c index 0fcda6e50..3897610b7 100644 --- a/tools/qfcc/source/dump_modules.c +++ b/tools/qfcc/source/dump_modules.c @@ -40,10 +40,11 @@ #include -#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 diff --git a/tools/qfcc/source/method.c b/tools/qfcc/source/method.c index 134f1cc64..9c82f89d5 100644 --- a/tools/qfcc/source/method.c +++ b/tools/qfcc/source/method.c @@ -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" diff --git a/tools/qfcc/source/options.c b/tools/qfcc/source/options.c index 2e701c403..7283ba9f7 100644 --- a/tools/qfcc/source/options.c +++ b/tools/qfcc/source/options.c @@ -42,9 +42,10 @@ #include -#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" diff --git a/tools/qfcc/source/pragma.c b/tools/qfcc/source/pragma.c index edabcaaf4..60448815e 100644 --- a/tools/qfcc/source/pragma.c +++ b/tools/qfcc/source/pragma.c @@ -40,7 +40,8 @@ #include #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" diff --git a/tools/qfcc/source/qfprogs.c b/tools/qfcc/source/qfprogs.c index eea6aa7e8..19c7ed873 100644 --- a/tools/qfcc/source/qfprogs.c +++ b/tools/qfcc/source/qfprogs.c @@ -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" diff --git a/tools/qfcc/source/struct.c b/tools/qfcc/source/struct.c index 4bd82130c..164a491a2 100644 --- a/tools/qfcc/source/struct.c +++ b/tools/qfcc/source/struct.c @@ -43,10 +43,11 @@ #include #include -#include #include #include +#include + #include "tools/qfcc/include/class.h" #include "tools/qfcc/include/def.h" #include "tools/qfcc/include/defspace.h"