From f78b9739785a564678086862d98a7ee81d46944c Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Tue, 27 Mar 2001 20:33:07 +0000 Subject: [PATCH] move the api headers into include/QF and clean up (most of) the resulting mess. target specific files that I don't build won't compile yet. just put QF/ infront of the offending headers. Also move ver_check into libqfutils --- include/{ => QF}/asm_i386.h | 0 include/{ => QF}/checksum.h | 0 include/{ => QF}/cmd.h | 0 include/{ => QF}/compat.h | 0 include/{ => QF}/console.h | 0 include/{ => QF}/crc.h | 0 include/{ => QF}/cvar.h | 0 include/{ => QF}/gcc_attr.h | 0 include/{ => QF}/hash.h | 0 include/{ => QF}/info.h | 0 include/{ => QF}/keys.h | 0 include/{ => QF}/link.h | 0 include/{ => QF}/mathlib.h | 0 include/{ => QF}/mdfour.h | 0 include/{ => QF}/msg.h | 0 include/{ => QF}/pr_comp.h | 0 include/{ => QF}/progs.h | 0 include/{ => QF}/qargs.h | 0 include/{ => QF}/qdefs.h | 0 include/{ => QF}/qendian.h | 0 include/{ => QF}/qfplist.h | 0 include/{ => QF}/qtypes.h | 0 include/{ => QF}/quakefs.h | 0 include/{ => QF}/quakeio.h | 0 include/{ => QF}/sizebuf.h | 0 include/{ => QF}/sys.h | 0 include/{ => QF}/uint32.h | 0 include/{ => QF}/va.h | 0 {qw/include => include/QF}/ver_check.h | 0 include/{ => QF}/zone.h | 0 libs/gamecode/pr_edict.c | 24 ++++++++++++------------ libs/gamecode/pr_exec.c | 8 ++++---- libs/gamecode/pr_strings.c | 4 ++-- libs/util/Makefile.am | 2 +- libs/util/checksum.c | 6 +++--- libs/util/cmd.c | 20 ++++++++++---------- libs/util/crc.c | 2 +- libs/util/cvar.c | 10 +++++----- libs/util/hash.c | 4 ++-- libs/util/info.c | 4 ++-- libs/util/link.c | 2 +- libs/util/mathlib.c | 6 +++--- libs/util/mdfour.c | 4 ++-- libs/util/msg.c | 6 +++--- libs/util/qargs.c | 10 +++++----- libs/util/qendian.c | 2 +- libs/util/qfplist.c | 4 ++-- libs/util/sizebuf.c | 8 ++++---- libs/util/va.c | 2 +- {qw/source => libs/util}/ver_check.c | 0 libs/util/zone.c | 10 +++++----- nq/include/bspfile.h | 2 +- nq/include/client.h | 8 ++++---- nq/include/context_x11.h | 4 ++-- nq/include/dga_check.h | 2 +- nq/include/game.h | 6 +++--- nq/include/glquake.h | 2 +- nq/include/host.h | 4 ++-- nq/include/input.h | 4 ++-- nq/include/joystick.h | 2 +- nq/include/model.h | 4 ++-- nq/include/net.h | 6 +++--- nq/include/net_udp.h | 2 +- nq/include/protocol.h | 2 +- nq/include/render.h | 4 ++-- nq/include/screen.h | 4 ++-- nq/include/server.h | 10 +++++----- nq/include/sound.h | 6 +++--- nq/include/sv_progs.h | 2 +- nq/include/vid.h | 2 +- nq/include/view.h | 4 ++-- nq/include/wad.h | 2 +- nq/include/world.h | 2 +- nq/source/cd_linux.c | 6 +++--- nq/source/cl_cam.c | 2 +- nq/source/cl_cmd.c | 8 ++++---- nq/source/cl_demo.c | 12 ++++++------ nq/source/cl_input.c | 6 +++--- nq/source/cl_main.c | 10 +++++----- nq/source/cl_parse.c | 8 ++++---- nq/source/cl_tent.c | 6 +++--- nq/source/com.c | 12 ++++++------ nq/source/console.c | 12 ++++++------ nq/source/context_x11.c | 12 ++++++------ nq/source/d_modech.c | 2 +- nq/source/d_surf.c | 6 +++--- nq/source/draw.c | 6 +++--- nq/source/game.c | 2 +- nq/source/gib.c | 12 ++++++------ nq/source/gib_instructions.c | 12 ++++++------ nq/source/gib_interpret.c | 12 ++++++------ nq/source/gib_modules.c | 12 ++++++------ nq/source/gib_parse.c | 12 ++++++------ nq/source/gib_stack.c | 12 ++++++------ nq/source/gib_vars.c | 12 ++++++------ nq/source/gl_draw.c | 12 ++++++------ nq/source/gl_mesh.c | 6 +++--- nq/source/gl_model_alias.c | 8 ++++---- nq/source/gl_model_brush.c | 8 ++++---- nq/source/gl_model_fullbright.c | 8 ++++---- nq/source/gl_model_sprite.c | 8 ++++---- nq/source/gl_part.c | 4 ++-- nq/source/gl_refrag.c | 4 ++-- nq/source/gl_rmain.c | 8 ++++---- nq/source/gl_rmisc.c | 10 +++++----- nq/source/gl_rsurf.c | 14 +++++++------- nq/source/gl_screen.c | 16 ++++++++-------- nq/source/gl_view.c | 4 ++-- nq/source/gl_warp.c | 8 ++++---- nq/source/host.c | 14 +++++++------- nq/source/host_cmd.c | 12 ++++++------ nq/source/in_sdl.c | 12 ++++++------ nq/source/in_svgalib.c | 12 ++++++------ nq/source/in_x11.c | 12 ++++++------ nq/source/joy_linux.c | 6 +++--- nq/source/keys.c | 10 +++++----- nq/source/model.c | 8 ++++---- nq/source/model_alias.c | 8 ++++---- nq/source/model_brush.c | 8 ++++---- nq/source/model_sprite.c | 8 ++++---- nq/source/net_dgrm.c | 14 +++++++------- nq/source/net_loop.c | 6 +++--- nq/source/net_main.c | 12 ++++++------ nq/source/net_udp.c | 6 +++--- nq/source/net_vcr.c | 5 +++-- nq/source/pr_cmds.c | 10 +++++----- nq/source/quakefs.c | 22 +++++++++++----------- nq/source/quakeio.c | 3 ++- nq/source/r_alias.c | 4 ++-- nq/source/r_bsp.c | 4 ++-- nq/source/r_efrag.c | 4 ++-- nq/source/r_main.c | 6 +++--- nq/source/r_misc.c | 4 ++-- nq/source/r_part.c | 6 +++--- nq/source/r_sprite.c | 4 ++-- nq/source/r_surf.c | 2 +- nq/source/r_view.c | 6 +++--- nq/source/sbar.c | 6 +++--- nq/source/screen.c | 10 +++++----- nq/source/snd_alsa_0_9.c | 6 +++--- nq/source/snd_dma.c | 8 ++++---- nq/source/snd_mem.c | 8 ++++---- nq/source/snd_mix.c | 2 +- nq/source/sv_cvar.c | 2 +- nq/source/sv_main.c | 8 ++++---- nq/source/sv_phys.c | 4 ++-- nq/source/sv_progs.c | 4 ++-- nq/source/sv_user.c | 10 +++++----- nq/source/sw_model_alias.c | 8 ++++---- nq/source/sw_model_brush.c | 8 ++++---- nq/source/sw_model_sprite.c | 8 ++++---- nq/source/sw_view.c | 4 ++-- nq/source/sys_unix.c | 6 +++--- nq/source/vid.c | 8 ++++---- nq/source/vid_common_gl.c | 6 +++--- nq/source/vid_glx.c | 12 ++++++------ nq/source/vid_sdl.c | 8 ++++---- nq/source/vid_sgl.c | 12 ++++++------ nq/source/vid_svgalib.c | 12 ++++++------ nq/source/vid_x11.c | 16 ++++++++-------- nq/source/wad.c | 7 ++++--- nq/source/world.c | 4 ++-- qw/include/bspfile.h | 2 +- qw/include/cdaudio.h | 2 +- qw/include/cl_demo.h | 2 +- qw/include/cl_ents.h | 2 +- qw/include/cl_main.h | 2 +- qw/include/cl_parse.h | 2 +- qw/include/cl_slist.h | 2 +- qw/include/client.h | 6 +++--- qw/include/commdef.h | 4 ++-- qw/include/context_x11.h | 2 +- qw/include/d_iface.h | 2 +- qw/include/dga_check.h | 2 +- qw/include/glquake.h | 2 +- qw/include/host.h | 4 ++-- qw/include/input.h | 2 +- qw/include/joystick.h | 2 +- qw/include/locs.h | 2 +- qw/include/model.h | 4 ++-- qw/include/modelgen.h | 2 +- qw/include/msg_ucmd.h | 2 +- qw/include/net.h | 6 +++--- qw/include/pcx.h | 2 +- qw/include/pmove.h | 2 +- qw/include/protocol.h | 2 +- qw/include/qfgl_ext.h | 2 +- qw/include/r_dynamic.h | 2 +- qw/include/r_local.h | 4 ++-- qw/include/r_shared.h | 4 ++-- qw/include/render.h | 4 ++-- qw/include/screen.h | 2 +- qw/include/server.h | 12 ++++++------ qw/include/sound.h | 6 +++--- qw/include/sv_progs.h | 2 +- qw/include/teamplay.h | 2 +- qw/include/tga.h | 4 ++-- qw/include/vid.h | 2 +- qw/include/view.h | 4 ++-- qw/include/wad.h | 2 +- qw/include/world.h | 4 ++-- qw/source/Makefile.am | 2 +- qw/source/cd_linux.c | 8 ++++---- qw/source/cl_cam.c | 4 ++-- qw/source/cl_cmd.c | 6 +++--- qw/source/cl_cvar.c | 6 +++--- qw/source/cl_demo.c | 12 ++++++------ qw/source/cl_ents.c | 4 ++-- qw/source/cl_input.c | 10 +++++----- qw/source/cl_main.c | 20 ++++++++++---------- qw/source/cl_misc.c | 2 +- qw/source/cl_parse.c | 8 ++++---- qw/source/cl_pred.c | 4 ++-- qw/source/cl_slist.c | 6 +++--- qw/source/cl_sys_unix.c | 6 +++--- qw/source/cl_tent.c | 4 ++-- qw/source/com.c | 12 ++++++------ qw/source/console.c | 12 ++++++------ qw/source/context_x11.c | 12 ++++++------ qw/source/d_modech.c | 2 +- qw/source/d_surf.c | 4 ++-- qw/source/dga_check.c | 2 +- qw/source/draw.c | 6 +++--- qw/source/gl_draw.c | 6 +++--- qw/source/gl_dyn_fires.c | 4 ++-- qw/source/gl_dyn_part.c | 8 ++++---- qw/source/gl_mesh.c | 6 +++--- qw/source/gl_model_alias.c | 4 ++-- qw/source/gl_model_brush.c | 6 +++--- qw/source/gl_model_fullbright.c | 8 ++++---- qw/source/gl_model_sprite.c | 2 +- qw/source/gl_ngraph.c | 2 +- qw/source/gl_rmain.c | 8 ++++---- qw/source/gl_rmisc.c | 8 ++++---- qw/source/gl_rsurf.c | 2 +- qw/source/gl_screen.c | 8 ++++---- qw/source/gl_skin.c | 2 +- qw/source/gl_sky.c | 2 +- qw/source/gl_sky_clip.c | 4 ++-- qw/source/gl_textures.c | 8 ++++---- qw/source/gl_warp.c | 4 ++-- qw/source/in_sdl.c | 12 ++++++------ qw/source/in_svgalib.c | 12 ++++++------ qw/source/in_x11.c | 12 ++++++------ qw/source/joy_linux.c | 6 +++--- qw/source/keys.c | 10 +++++----- qw/source/locs.c | 8 ++++---- qw/source/model.c | 6 +++--- qw/source/model_alias.c | 10 +++++----- qw/source/model_brush.c | 6 +++--- qw/source/model_sprite.c | 2 +- qw/source/msg_ucmd.c | 6 +++--- qw/source/net_chan.c | 6 +++--- qw/source/net_udp.c | 8 ++++---- qw/source/pcx.c | 10 +++++----- qw/source/pmove.c | 6 +++--- qw/source/pmovetst.c | 6 +++--- qw/source/qfgl_ext.c | 2 +- qw/source/quakefs.c | 22 +++++++++++----------- qw/source/quakeio.c | 4 ++-- qw/source/r_alias.c | 4 ++-- qw/source/r_bsp.c | 4 ++-- qw/source/r_efrag.c | 4 ++-- qw/source/r_main.c | 8 ++++---- qw/source/r_misc.c | 6 +++--- qw/source/r_part.c | 6 +++--- qw/source/r_sprite.c | 4 ++-- qw/source/r_surf.c | 2 +- qw/source/r_view.c | 6 +++--- qw/source/sbar.c | 6 +++--- qw/source/screen.c | 8 ++++---- qw/source/skin.c | 12 ++++++------ qw/source/snd_alsa_0_9.c | 6 +++--- qw/source/snd_dma.c | 8 ++++---- qw/source/snd_mem.c | 8 ++++---- qw/source/snd_mix.c | 2 +- qw/source/sv_ccmds.c | 14 +++++++------- qw/source/sv_cvar.c | 2 +- qw/source/sv_ents.c | 4 ++-- qw/source/sv_init.c | 8 ++++---- qw/source/sv_main.c | 16 ++++++++-------- qw/source/sv_model.c | 2 +- qw/source/sv_move.c | 2 +- qw/source/sv_nchan.c | 2 +- qw/source/sv_phys.c | 2 +- qw/source/sv_pr_cmds.c | 6 +++--- qw/source/sv_progs.c | 2 +- qw/source/sv_send.c | 4 ++-- qw/source/sv_sys_unix.c | 6 +++--- qw/source/sv_user.c | 14 +++++++------- qw/source/sw_model_alias.c | 6 +++--- qw/source/sw_model_sprite.c | 2 +- qw/source/sw_skin.c | 2 +- qw/source/sys_unix.c | 6 +++--- qw/source/teamplay.c | 6 +++--- qw/source/tga.c | 6 +++--- qw/source/vid.c | 8 ++++---- qw/source/vid_common_gl.c | 6 +++--- qw/source/vid_glx.c | 10 +++++----- qw/source/vid_sdl.c | 10 +++++----- qw/source/vid_sgl.c | 10 +++++----- qw/source/vid_svgalib.c | 12 ++++++------ qw/source/vid_x11.c | 14 +++++++------- qw/source/wad.c | 6 +++--- qw/source/world.c | 4 ++-- tools/qfcc/configure.in | 20 ++++++++++++++++++++ 306 files changed, 897 insertions(+), 874 deletions(-) rename include/{ => QF}/asm_i386.h (100%) rename include/{ => QF}/checksum.h (100%) rename include/{ => QF}/cmd.h (100%) rename include/{ => QF}/compat.h (100%) rename include/{ => QF}/console.h (100%) rename include/{ => QF}/crc.h (100%) rename include/{ => QF}/cvar.h (100%) rename include/{ => QF}/gcc_attr.h (100%) rename include/{ => QF}/hash.h (100%) rename include/{ => QF}/info.h (100%) rename include/{ => QF}/keys.h (100%) rename include/{ => QF}/link.h (100%) rename include/{ => QF}/mathlib.h (100%) rename include/{ => QF}/mdfour.h (100%) rename include/{ => QF}/msg.h (100%) rename include/{ => QF}/pr_comp.h (100%) rename include/{ => QF}/progs.h (100%) rename include/{ => QF}/qargs.h (100%) rename include/{ => QF}/qdefs.h (100%) rename include/{ => QF}/qendian.h (100%) rename include/{ => QF}/qfplist.h (100%) rename include/{ => QF}/qtypes.h (100%) rename include/{ => QF}/quakefs.h (100%) rename include/{ => QF}/quakeio.h (100%) rename include/{ => QF}/sizebuf.h (100%) rename include/{ => QF}/sys.h (100%) rename include/{ => QF}/uint32.h (100%) rename include/{ => QF}/va.h (100%) rename {qw/include => include/QF}/ver_check.h (100%) rename include/{ => QF}/zone.h (100%) rename {qw/source => libs/util}/ver_check.c (100%) diff --git a/include/asm_i386.h b/include/QF/asm_i386.h similarity index 100% rename from include/asm_i386.h rename to include/QF/asm_i386.h diff --git a/include/checksum.h b/include/QF/checksum.h similarity index 100% rename from include/checksum.h rename to include/QF/checksum.h diff --git a/include/cmd.h b/include/QF/cmd.h similarity index 100% rename from include/cmd.h rename to include/QF/cmd.h diff --git a/include/compat.h b/include/QF/compat.h similarity index 100% rename from include/compat.h rename to include/QF/compat.h diff --git a/include/console.h b/include/QF/console.h similarity index 100% rename from include/console.h rename to include/QF/console.h diff --git a/include/crc.h b/include/QF/crc.h similarity index 100% rename from include/crc.h rename to include/QF/crc.h diff --git a/include/cvar.h b/include/QF/cvar.h similarity index 100% rename from include/cvar.h rename to include/QF/cvar.h diff --git a/include/gcc_attr.h b/include/QF/gcc_attr.h similarity index 100% rename from include/gcc_attr.h rename to include/QF/gcc_attr.h diff --git a/include/hash.h b/include/QF/hash.h similarity index 100% rename from include/hash.h rename to include/QF/hash.h diff --git a/include/info.h b/include/QF/info.h similarity index 100% rename from include/info.h rename to include/QF/info.h diff --git a/include/keys.h b/include/QF/keys.h similarity index 100% rename from include/keys.h rename to include/QF/keys.h diff --git a/include/link.h b/include/QF/link.h similarity index 100% rename from include/link.h rename to include/QF/link.h diff --git a/include/mathlib.h b/include/QF/mathlib.h similarity index 100% rename from include/mathlib.h rename to include/QF/mathlib.h diff --git a/include/mdfour.h b/include/QF/mdfour.h similarity index 100% rename from include/mdfour.h rename to include/QF/mdfour.h diff --git a/include/msg.h b/include/QF/msg.h similarity index 100% rename from include/msg.h rename to include/QF/msg.h diff --git a/include/pr_comp.h b/include/QF/pr_comp.h similarity index 100% rename from include/pr_comp.h rename to include/QF/pr_comp.h diff --git a/include/progs.h b/include/QF/progs.h similarity index 100% rename from include/progs.h rename to include/QF/progs.h diff --git a/include/qargs.h b/include/QF/qargs.h similarity index 100% rename from include/qargs.h rename to include/QF/qargs.h diff --git a/include/qdefs.h b/include/QF/qdefs.h similarity index 100% rename from include/qdefs.h rename to include/QF/qdefs.h diff --git a/include/qendian.h b/include/QF/qendian.h similarity index 100% rename from include/qendian.h rename to include/QF/qendian.h diff --git a/include/qfplist.h b/include/QF/qfplist.h similarity index 100% rename from include/qfplist.h rename to include/QF/qfplist.h diff --git a/include/qtypes.h b/include/QF/qtypes.h similarity index 100% rename from include/qtypes.h rename to include/QF/qtypes.h diff --git a/include/quakefs.h b/include/QF/quakefs.h similarity index 100% rename from include/quakefs.h rename to include/QF/quakefs.h diff --git a/include/quakeio.h b/include/QF/quakeio.h similarity index 100% rename from include/quakeio.h rename to include/QF/quakeio.h diff --git a/include/sizebuf.h b/include/QF/sizebuf.h similarity index 100% rename from include/sizebuf.h rename to include/QF/sizebuf.h diff --git a/include/sys.h b/include/QF/sys.h similarity index 100% rename from include/sys.h rename to include/QF/sys.h diff --git a/include/uint32.h b/include/QF/uint32.h similarity index 100% rename from include/uint32.h rename to include/QF/uint32.h diff --git a/include/va.h b/include/QF/va.h similarity index 100% rename from include/va.h rename to include/QF/va.h diff --git a/qw/include/ver_check.h b/include/QF/ver_check.h similarity index 100% rename from qw/include/ver_check.h rename to include/QF/ver_check.h diff --git a/include/zone.h b/include/QF/zone.h similarity index 100% rename from include/zone.h rename to include/QF/zone.h diff --git a/libs/gamecode/pr_edict.c b/libs/gamecode/pr_edict.c index 41f3d9946..26a1e52a9 100644 --- a/libs/gamecode/pr_edict.c +++ b/libs/gamecode/pr_edict.c @@ -36,18 +36,18 @@ # include #endif -#include "cmd.h" -#include "console.h" -#include "crc.h" -#include "cvar.h" -#include "hash.h" -#include "progs.h" -#include "qdefs.h" -#include "qendian.h" -#include "quakefs.h" -#include "sys.h" //XXX -#include "zone.h" -#include "va.h" +#include "QF/cmd.h" +#include "QF/console.h" +#include "QF/crc.h" +#include "QF/cvar.h" +#include "QF/hash.h" +#include "QF/progs.h" +#include "QF/qdefs.h" +#include "QF/qendian.h" +#include "QF/quakefs.h" +#include "QF/sys.h" //XXX +#include "QF/zone.h" +#include "QF/va.h" cvar_t *pr_boundscheck; diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c index b661d03bb..4a464bfab 100644 --- a/libs/gamecode/pr_exec.c +++ b/libs/gamecode/pr_exec.c @@ -38,10 +38,10 @@ #include -#include "console.h" -#include "cvar.h" -#include "progs.h" -#include "sys.h" +#include "QF/console.h" +#include "QF/cvar.h" +#include "QF/progs.h" +#include "QF/sys.h" char *pr_opnames[] = { "DONE", diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c index b21c89734..98434a072 100644 --- a/libs/gamecode/pr_strings.c +++ b/libs/gamecode/pr_strings.c @@ -39,8 +39,8 @@ #include -#include "hash.h" -#include "progs.h" +#include "QF/hash.h" +#include "QF/progs.h" static char * strref_get_key (void *_sr, void *notused) diff --git a/libs/util/Makefile.am b/libs/util/Makefile.am index d5f4089d3..0267272b3 100644 --- a/libs/util/Makefile.am +++ b/libs/util/Makefile.am @@ -1,6 +1,6 @@ noinst_LIBRARIES = libqfutil.a -libqfutil_a_SOURCES = checksum.c cmd.c crc.c cvar.c hash.c info.c link.c math.S mathlib.c mdfour.c msg.c qargs.c qendian.c qfplist.c sizebuf.c va.c zone.c +libqfutil_a_SOURCES = checksum.c cmd.c crc.c cvar.c hash.c info.c link.c math.S mathlib.c mdfour.c msg.c qargs.c qendian.c qfplist.c sizebuf.c va.c ver_check.c zone.c all-local: ../libqfutil.a diff --git a/libs/util/checksum.c b/libs/util/checksum.c index 58075eb69..132d69f7a 100644 --- a/libs/util/checksum.c +++ b/libs/util/checksum.c @@ -41,9 +41,9 @@ # include #endif -#include "checksum.h" -#include "crc.h" -#include "mdfour.h" +#include "QF/checksum.h" +#include "QF/crc.h" +#include "QF/mdfour.h" static byte chktbl[1024 + 4] = { 0x78, 0xd2, 0x94, 0xe3, 0x41, 0xec, 0xd6, 0xd5, 0xcb, 0xfc, 0xdb, 0x8a, diff --git a/libs/util/cmd.c b/libs/util/cmd.c index 7a20faa1c..9a1f09e56 100644 --- a/libs/util/cmd.c +++ b/libs/util/cmd.c @@ -38,16 +38,16 @@ #include -#include "cvar.h" -#include "cmd.h" -#include "console.h" -#include "hash.h" -#include "qargs.h" -#include "qendian.h" -#include "quakefs.h" -#include "sizebuf.h" -#include "sys.h" -#include "zone.h" +#include "QF/cvar.h" +#include "QF/cmd.h" +#include "QF/console.h" +#include "QF/hash.h" +#include "QF/qargs.h" +#include "QF/qendian.h" +#include "QF/quakefs.h" +#include "QF/sizebuf.h" +#include "QF/sys.h" +#include "QF/zone.h" void Cmd_ForwardToServer (void); diff --git a/libs/util/crc.c b/libs/util/crc.c index 8006b7480..9ae8bcfeb 100644 --- a/libs/util/crc.c +++ b/libs/util/crc.c @@ -30,7 +30,7 @@ # include "config.h" #endif -#include "crc.h" +#include "QF/crc.h" // this is a 16 bit, non-reflected CRC using the polynomial 0x1021 // and the initial and final xor values shown below... in other words, the diff --git a/libs/util/cvar.c b/libs/util/cvar.c index caca8a8f8..b3b820d2e 100644 --- a/libs/util/cvar.c +++ b/libs/util/cvar.c @@ -42,11 +42,11 @@ #include #include -#include "console.h" -#include "cmd.h" -#include "cvar.h" -#include "hash.h" -#include "qargs.h" +#include "QF/console.h" +#include "QF/cmd.h" +#include "QF/cvar.h" +#include "QF/hash.h" +#include "QF/qargs.h" cvar_t *cvar_vars; char *cvar_null_string = ""; diff --git a/libs/util/hash.c b/libs/util/hash.c index ae670c6d1..18843234a 100644 --- a/libs/util/hash.c +++ b/libs/util/hash.c @@ -37,8 +37,8 @@ # include #endif -#include "compat.h" -#include "hash.h" +#include "QF/compat.h" +#include "QF/hash.h" static unsigned long hash (const char *str) diff --git a/libs/util/info.c b/libs/util/info.c index 3ad37107a..9d3b3b4f1 100644 --- a/libs/util/info.c +++ b/libs/util/info.c @@ -39,8 +39,8 @@ #include #include -#include "console.h" -#include "info.h" +#include "QF/console.h" +#include "QF/info.h" /* INFO STRINGS diff --git a/libs/util/link.c b/libs/util/link.c index 0a5744247..95b89667c 100644 --- a/libs/util/link.c +++ b/libs/util/link.c @@ -30,7 +30,7 @@ # include "config.h" #endif -#include "link.h" +#include "QF/link.h" // ClearLink is used for new headnodes void diff --git a/libs/util/mathlib.c b/libs/util/mathlib.c index a72bd8b61..d1a9f6e5c 100644 --- a/libs/util/mathlib.c +++ b/libs/util/mathlib.c @@ -38,9 +38,9 @@ #include -#include "mathlib.h" -#include "qtypes.h" -#include "sys.h" +#include "QF/mathlib.h" +#include "QF/qtypes.h" +#include "QF/sys.h" vec3_t vec3_origin = { 0, 0, 0 }; int nanmask = 255 << 23; diff --git a/libs/util/mdfour.c b/libs/util/mdfour.c index 348cb0357..d4ead499d 100644 --- a/libs/util/mdfour.c +++ b/libs/util/mdfour.c @@ -37,8 +37,8 @@ # include #endif -#include "mdfour.h" -#include "uint32.h" +#include "QF/mdfour.h" +#include "QF/uint32.h" /* NOTE: This code makes no attempt to be fast! diff --git a/libs/util/msg.c b/libs/util/msg.c index cf99d4700..189030d2a 100644 --- a/libs/util/msg.c +++ b/libs/util/msg.c @@ -36,9 +36,9 @@ # include #endif -#include "msg.h" -#include "qendian.h" -#include "sys.h" +#include "QF/msg.h" +#include "QF/qendian.h" +#include "QF/sys.h" /* MESSAGE IO FUNCTIONS diff --git a/libs/util/qargs.c b/libs/util/qargs.c index d4044c119..7ceab80e1 100644 --- a/libs/util/qargs.c +++ b/libs/util/qargs.c @@ -43,11 +43,11 @@ #include #include -#include "console.h" -#include "cmd.h" -#include "crc.h" -#include "qtypes.h" -#include "sys.h" +#include "QF/console.h" +#include "QF/cmd.h" +#include "QF/crc.h" +#include "QF/qtypes.h" +#include "QF/sys.h" static char **largv; static char *argvdummy = " "; diff --git a/libs/util/qendian.c b/libs/util/qendian.c index 5323ae8c0..f942bb579 100644 --- a/libs/util/qendian.c +++ b/libs/util/qendian.c @@ -34,7 +34,7 @@ #include -#include "qtypes.h" +#include "QF/qtypes.h" /* BYTE ORDER FUNCTIONS diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c index f52059379..5e2b93d39 100644 --- a/libs/util/qfplist.c +++ b/libs/util/qfplist.c @@ -34,8 +34,8 @@ #include #include -#include "qfplist.h" -#include "qtypes.h" +#include "QF/qfplist.h" +#include "QF/qtypes.h" static plitem_t *PL_ParsePropertyListItem (pldata_t *); static qboolean PL_SkipSpace (pldata_t *); diff --git a/libs/util/sizebuf.c b/libs/util/sizebuf.c index 996e3cf8e..faca12ccf 100644 --- a/libs/util/sizebuf.c +++ b/libs/util/sizebuf.c @@ -36,10 +36,10 @@ # include #endif -#include "console.h" -#include "sizebuf.h" -#include "sys.h" -#include "zone.h" +#include "QF/console.h" +#include "QF/sizebuf.h" +#include "QF/sys.h" +#include "QF/zone.h" void SZ_Alloc (sizebuf_t *buf, int startsize) diff --git a/libs/util/va.c b/libs/util/va.c index b7005d1ae..ff7144f2f 100644 --- a/libs/util/va.c +++ b/libs/util/va.c @@ -33,7 +33,7 @@ #include #include -#include "qtypes.h" +#include "QF/qtypes.h" /* va diff --git a/qw/source/ver_check.c b/libs/util/ver_check.c similarity index 100% rename from qw/source/ver_check.c rename to libs/util/ver_check.c diff --git a/libs/util/zone.c b/libs/util/zone.c index 798502af7..a46148827 100644 --- a/libs/util/zone.c +++ b/libs/util/zone.c @@ -38,11 +38,11 @@ #include -#include "cmd.h" -#include "console.h" -#include "qargs.h" -#include "sys.h" -#include "zone.h" +#include "QF/cmd.h" +#include "QF/console.h" +#include "QF/qargs.h" +#include "QF/sys.h" +#include "QF/zone.h" #define DYNAMIC_SIZE 0x20000 #define ZONEID 0x1d4a11 diff --git a/nq/include/bspfile.h b/nq/include/bspfile.h index 48838e8e9..f939f5eb5 100644 --- a/nq/include/bspfile.h +++ b/nq/include/bspfile.h @@ -29,7 +29,7 @@ #ifndef __bspfile_h #define __bspfile_h -#include "qtypes.h" +#include "QF/qtypes.h" // upper design bounds diff --git a/nq/include/client.h b/nq/include/client.h index 83fd68075..bd3edfad4 100644 --- a/nq/include/client.h +++ b/nq/include/client.h @@ -31,15 +31,15 @@ #include -#include "info.h" -#include "mathlib.h" +#include "QF/info.h" +#include "QF/mathlib.h" #include "protocol.h" #include "net.h" #include "model.h" #include "sound.h" #include "render.h" -#include "cvar.h" -#include "quakefs.h" +#include "QF/cvar.h" +#include "QF/quakefs.h" #include "game.h" typedef struct usercmd_s diff --git a/nq/include/context_x11.h b/nq/include/context_x11.h index b0f697fa6..f8c248045 100644 --- a/nq/include/context_x11.h +++ b/nq/include/context_x11.h @@ -34,8 +34,8 @@ #include #include -#include "cvar.h" -#include "qtypes.h" +#include "QF/cvar.h" +#include "QF/qtypes.h" void GetEvent( void ); diff --git a/nq/include/dga_check.h b/nq/include/dga_check.h index 881d55310..f3d5f16da 100644 --- a/nq/include/dga_check.h +++ b/nq/include/dga_check.h @@ -32,7 +32,7 @@ #include -#include "qtypes.h" +#include "QF/qtypes.h" /* VID_CheckDGA diff --git a/nq/include/game.h b/nq/include/game.h index fbab9929c..2d179f151 100644 --- a/nq/include/game.h +++ b/nq/include/game.h @@ -31,9 +31,9 @@ #ifndef __game_h #define __game_h -#include "qtypes.h" -#include "cvar.h" -#include "qdefs.h" +#include "QF/qtypes.h" +#include "QF/cvar.h" +#include "QF/qdefs.h" #undef MAX_DATAGRAM #define MAX_DATAGRAM 1024 // max length of unreliable message diff --git a/nq/include/glquake.h b/nq/include/glquake.h index 90cdc6cfd..4a962a0b5 100644 --- a/nq/include/glquake.h +++ b/nq/include/glquake.h @@ -42,7 +42,7 @@ #include -#include "qtypes.h" +#include "QF/qtypes.h" #include "model.h" #include "d_iface.h" diff --git a/nq/include/host.h b/nq/include/host.h index e9d8b97b9..619c457f7 100644 --- a/nq/include/host.h +++ b/nq/include/host.h @@ -29,8 +29,8 @@ #ifndef __host_h #define __host_h -#include "qtypes.h" -#include "cvar.h" +#include "QF/qtypes.h" +#include "QF/cvar.h" extern qboolean noclip_anglehack; diff --git a/nq/include/input.h b/nq/include/input.h index 7e06f75b9..abdf04f05 100644 --- a/nq/include/input.h +++ b/nq/include/input.h @@ -29,9 +29,9 @@ #ifndef _INPUT_H #define _INPUT_H -#include "cvar.h" +#include "QF/cvar.h" #include "protocol.h" -#include "qtypes.h" +#include "QF/qtypes.h" #define freelook (in_mlook.state&1 || cl_freelook->int_val) diff --git a/nq/include/joystick.h b/nq/include/joystick.h index ea9dfadb6..de5bc3aea 100644 --- a/nq/include/joystick.h +++ b/nq/include/joystick.h @@ -30,7 +30,7 @@ # include "config.h" #endif -#include "cvar.h" +#include "QF/cvar.h" #include "protocol.h" extern cvar_t *joy_device; // Joystick device name diff --git a/nq/include/model.h b/nq/include/model.h index 1d710c971..94f32e9f1 100644 --- a/nq/include/model.h +++ b/nq/include/model.h @@ -29,12 +29,12 @@ #ifndef _MODEL_H #define _MODEL_H -#include "qtypes.h" +#include "QF/qtypes.h" #include "render.h" #include "bspfile.h" #include "spritegn.h" #include "modelgen.h" -#include "zone.h" +#include "QF/zone.h" /* diff --git a/nq/include/net.h b/nq/include/net.h index 35f01491b..6611c371b 100644 --- a/nq/include/net.h +++ b/nq/include/net.h @@ -29,9 +29,9 @@ #ifndef __net_h #define __net_h -#include "gcc_attr.h" -#include "sizebuf.h" -#include "cvar.h" +#include "QF/gcc_attr.h" +#include "QF/sizebuf.h" +#include "QF/cvar.h" struct qsockaddr { diff --git a/nq/include/net_udp.h b/nq/include/net_udp.h index 415983f37..1b09c53b1 100644 --- a/nq/include/net_udp.h +++ b/nq/include/net_udp.h @@ -29,7 +29,7 @@ #ifndef __net_udp_h #define __net_udp_h -#include "qtypes.h" +#include "QF/qtypes.h" int UDP_Init (void); void UDP_Shutdown (void); diff --git a/nq/include/protocol.h b/nq/include/protocol.h index 87e65eae5..2c45575c9 100644 --- a/nq/include/protocol.h +++ b/nq/include/protocol.h @@ -29,7 +29,7 @@ #ifndef __protocol_h #define __protocol_h -#include "qtypes.h" +#include "QF/qtypes.h" #define PROTOCOL_VERSION 15 diff --git a/nq/include/render.h b/nq/include/render.h index 4c3e61922..8b64f7419 100644 --- a/nq/include/render.h +++ b/nq/include/render.h @@ -29,8 +29,8 @@ #ifndef __render_h #define __render_h -#include "mathlib.h" -#include "cvar.h" +#include "QF/mathlib.h" +#include "QF/cvar.h" #include "vid.h" #include "protocol.h" diff --git a/nq/include/screen.h b/nq/include/screen.h index 275ba5c6f..28eab996a 100644 --- a/nq/include/screen.h +++ b/nq/include/screen.h @@ -29,8 +29,8 @@ #ifndef __screen_h #define __screen_h -#include "qtypes.h" -#include "cvar.h" +#include "QF/qtypes.h" +#include "QF/cvar.h" void SCR_Init (void); void SCR_InitCvars (void); diff --git a/nq/include/server.h b/nq/include/server.h index d6fb6c706..3043bca51 100644 --- a/nq/include/server.h +++ b/nq/include/server.h @@ -31,15 +31,15 @@ #include -#include "gcc_attr.h" +#include "QF/gcc_attr.h" #include "net.h" -#include "cvar.h" +#include "QF/cvar.h" #include "protocol.h" #include "model.h" #include "sv_progs.h" -#include "sizebuf.h" -#include "info.h" -#include "quakeio.h" +#include "QF/sizebuf.h" +#include "QF/info.h" +#include "QF/quakeio.h" #include "client.h" extern progs_t sv_pr_state; diff --git a/nq/include/sound.h b/nq/include/sound.h index 379760b10..92a32aba4 100644 --- a/nq/include/sound.h +++ b/nq/include/sound.h @@ -30,9 +30,9 @@ #ifndef __sound_h #define __sound_h -#include "mathlib.h" -#include "cvar.h" -#include "zone.h" +#include "QF/mathlib.h" +#include "QF/cvar.h" +#include "QF/zone.h" #define DEFAULT_SOUND_PACKET_VOLUME 255 #define DEFAULT_SOUND_PACKET_ATTENUATION 1.0 diff --git a/nq/include/sv_progs.h b/nq/include/sv_progs.h index 418bd1f2b..d1f3cd0c7 100644 --- a/nq/include/sv_progs.h +++ b/nq/include/sv_progs.h @@ -32,7 +32,7 @@ #ifndef __sv_progs_h #define __sv_progs_h -#include "progs.h" +#include "QF/progs.h" #include "sv_pr_cmds.h" typedef struct { diff --git a/nq/include/vid.h b/nq/include/vid.h index 53d000bd3..5f9412a2c 100644 --- a/nq/include/vid.h +++ b/nq/include/vid.h @@ -29,7 +29,7 @@ #ifndef __vid_h_ #define __vid_h_ -#include "qtypes.h" +#include "QF/qtypes.h" #define VID_CBITS 6 #define VID_GRADES (1 << VID_CBITS) diff --git a/nq/include/view.h b/nq/include/view.h index dae9e3153..1d0799060 100644 --- a/nq/include/view.h +++ b/nq/include/view.h @@ -29,8 +29,8 @@ #ifndef __view_h #define __view_h -#include "qtypes.h" -#include "cvar.h" +#include "QF/qtypes.h" +#include "QF/cvar.h" extern byte gammatable[256]; // palette is sent through this extern byte ramps[3][256]; diff --git a/nq/include/wad.h b/nq/include/wad.h index 08c633107..06d3fee1f 100644 --- a/nq/include/wad.h +++ b/nq/include/wad.h @@ -29,7 +29,7 @@ #ifndef __wad_h #define __wad_h -#include "qtypes.h" +#include "QF/qtypes.h" //=============== // TYPES diff --git a/nq/include/world.h b/nq/include/world.h index 6ed487475..56dc92789 100644 --- a/nq/include/world.h +++ b/nq/include/world.h @@ -29,7 +29,7 @@ #ifndef __world_h #define __world_h -#include "qtypes.h" +#include "QF/qtypes.h" #include "sv_progs.h" typedef struct diff --git a/nq/source/cd_linux.c b/nq/source/cd_linux.c index 23aa4c18f..54d99cbe7 100644 --- a/nq/source/cd_linux.c +++ b/nq/source/cd_linux.c @@ -43,10 +43,10 @@ #include -#include "qargs.h" -#include "cmd.h" +#include "QF/qargs.h" +#include "QF/cmd.h" #include "cdaudio.h" -#include "console.h" +#include "QF/console.h" #include "sound.h" #include "client.h" diff --git a/nq/source/cl_cam.c b/nq/source/cl_cam.c index be4cfc296..366e4daae 100644 --- a/nq/source/cl_cam.c +++ b/nq/source/cl_cam.c @@ -30,7 +30,7 @@ # include "config.h" #endif -#include "mathlib.h" +#include "QF/mathlib.h" #include "client.h" #include "world.h" diff --git a/nq/source/cl_cmd.c b/nq/source/cl_cmd.c index ae6b847c0..ce9ff2110 100644 --- a/nq/source/cl_cmd.c +++ b/nq/source/cl_cmd.c @@ -38,10 +38,10 @@ #endif #include "client.h" -#include "cmd.h" -#include "console.h" -#include "msg.h" -#include "sizebuf.h" +#include "QF/cmd.h" +#include "QF/console.h" +#include "QF/msg.h" +#include "QF/sizebuf.h" /* Cmd_ForwardToServer diff --git a/nq/source/cl_demo.c b/nq/source/cl_demo.c index fb864dc53..4dc56bd05 100644 --- a/nq/source/cl_demo.c +++ b/nq/source/cl_demo.c @@ -33,14 +33,14 @@ #include -#include "qendian.h" -#include "va.h" +#include "QF/qendian.h" +#include "QF/va.h" #include "host.h" -#include "msg.h" +#include "QF/msg.h" #include "client.h" -#include "sys.h" -#include "console.h" -#include "cmd.h" +#include "QF/sys.h" +#include "QF/console.h" +#include "QF/cmd.h" void CL_FinishTimeDemo (void); diff --git a/nq/source/cl_input.c b/nq/source/cl_input.c index ea93ced95..b99de0cef 100644 --- a/nq/source/cl_input.c +++ b/nq/source/cl_input.c @@ -32,11 +32,11 @@ #include -#include "msg.h" +#include "QF/msg.h" #include "host.h" -#include "console.h" +#include "QF/console.h" #include "client.h" -#include "cmd.h" +#include "QF/cmd.h" /* =============================================================================== diff --git a/nq/source/cl_main.c b/nq/source/cl_main.c index 65fe85367..46018b440 100644 --- a/nq/source/cl_main.c +++ b/nq/source/cl_main.c @@ -31,18 +31,18 @@ # include "config.h" #endif -#include "msg.h" -#include "cvar.h" +#include "QF/msg.h" +#include "QF/cvar.h" #include "client.h" #include "chase.h" #include "input.h" #include "host.h" -#include "va.h" +#include "QF/va.h" #include "host.h" #include "server.h" -#include "console.h" +#include "QF/console.h" #include "screen.h" -#include "cmd.h" +#include "QF/cmd.h" // we need to declare some mouse variables here, because the menu system // references them even when on a unix system. diff --git a/nq/source/cl_parse.c b/nq/source/cl_parse.c index 2c2678ea8..38e9e5ea3 100644 --- a/nq/source/cl_parse.c +++ b/nq/source/cl_parse.c @@ -35,16 +35,16 @@ #include "client.h" #include "host.h" -#include "msg.h" -#include "console.h" +#include "QF/msg.h" +#include "QF/console.h" #include "cdaudio.h" -#include "sys.h" +#include "QF/sys.h" #include "sbar.h" #include "screen.h" #include "server.h" #include "game.h" #include "input.h" -#include "cmd.h" +#include "QF/cmd.h" char *svc_strings[] = { "svc_bad", diff --git a/nq/source/cl_tent.c b/nq/source/cl_tent.c index a0640bad3..8bbe0a452 100644 --- a/nq/source/cl_tent.c +++ b/nq/source/cl_tent.c @@ -32,9 +32,9 @@ #include "protocol.h" #include "client.h" -#include "msg.h" -#include "sys.h" -#include "console.h" +#include "QF/msg.h" +#include "QF/sys.h" +#include "QF/console.h" int num_temp_entities; entity_t cl_temp_entities[MAX_TEMP_ENTITIES]; diff --git a/nq/source/com.c b/nq/source/com.c index 1d1c6358b..be3d1250f 100644 --- a/nq/source/com.c +++ b/nq/source/com.c @@ -30,13 +30,13 @@ # include "config.h" #endif -#include "qendian.h" -#include "cvar.h" -#include "quakefs.h" -#include "console.h" -#include "qargs.h" +#include "QF/qendian.h" +#include "QF/cvar.h" +#include "QF/quakefs.h" +#include "QF/console.h" +#include "QF/qargs.h" #include "game.h" -#include "cmd.h" +#include "QF/cmd.h" cvar_t *registered; cvar_t *cmdline; diff --git a/nq/source/console.c b/nq/source/console.c index 7d4f67d23..23216476a 100644 --- a/nq/source/console.c +++ b/nq/source/console.c @@ -39,16 +39,16 @@ #include #include "client.h" -#include "cmd.h" -#include "console.h" +#include "QF/cmd.h" +#include "QF/console.h" #include "draw.h" #include "host.h" #include "input.h" -#include "keys.h" -#include "qargs.h" +#include "QF/keys.h" +#include "QF/qargs.h" #include "screen.h" -#include "sys.h" -#include "va.h" +#include "QF/sys.h" +#include "QF/va.h" int con_ormask; console_t con_main; diff --git a/nq/source/context_x11.c b/nq/source/context_x11.c index 9a778b99a..c3d840430 100644 --- a/nq/source/context_x11.c +++ b/nq/source/context_x11.c @@ -58,13 +58,13 @@ #include "context_x11.h" #include "dga_check.h" -#include "va.h" -#include "qargs.h" -#include "qtypes.h" +#include "QF/va.h" +#include "QF/qargs.h" +#include "QF/qtypes.h" #include "vid.h" -#include "sys.h" -#include "console.h" -#include "cvar.h" +#include "QF/sys.h" +#include "QF/console.h" +#include "QF/cvar.h" #include "input.h" static void (*event_handlers[LASTEvent]) (XEvent *); diff --git a/nq/source/d_modech.c b/nq/source/d_modech.c index 6331856c0..f9e98af80 100644 --- a/nq/source/d_modech.c +++ b/nq/source/d_modech.c @@ -32,7 +32,7 @@ #endif #include "d_local.h" -#include "sys.h" +#include "QF/sys.h" int d_vrectx, d_vrecty, d_vrectright_particle, d_vrectbottom_particle; diff --git a/nq/source/d_surf.c b/nq/source/d_surf.c index 88e3deeee..a77eebf7f 100644 --- a/nq/source/d_surf.c +++ b/nq/source/d_surf.c @@ -34,9 +34,9 @@ #include #include "game.h" -#include "sys.h" -#include "qargs.h" -#include "console.h" +#include "QF/sys.h" +#include "QF/qargs.h" +#include "QF/console.h" #include "d_local.h" #include "r_local.h" #include "d_iface.h" diff --git a/nq/source/draw.c b/nq/source/draw.c index 2b8c50d74..57477fe84 100644 --- a/nq/source/draw.c +++ b/nq/source/draw.c @@ -32,9 +32,9 @@ #include "draw.h" #include "vid.h" -#include "zone.h" -#include "sys.h" -#include "quakefs.h" +#include "QF/zone.h" +#include "QF/sys.h" +#include "QF/quakefs.h" #include "d_iface.h" #include "sound.h" diff --git a/nq/source/game.c b/nq/source/game.c index 78cbcdff5..10ca6d3d0 100644 --- a/nq/source/game.c +++ b/nq/source/game.c @@ -31,7 +31,7 @@ #ifdef HAVE_CONFIG_H # include #endif -#include "qargs.h" +#include "QF/qargs.h" #include "game.h" qboolean standard_quake = false; diff --git a/nq/source/gib.c b/nq/source/gib.c index 0025f4a08..3d7e33dd6 100644 --- a/nq/source/gib.c +++ b/nq/source/gib.c @@ -4,12 +4,12 @@ #include #include -#include "cvar.h" -#include "console.h" -#include "qargs.h" -#include "cmd.h" -#include "zone.h" -#include "quakefs.h" +#include "QF/cvar.h" +#include "QF/console.h" +#include "QF/qargs.h" +#include "QF/cmd.h" +#include "QF/zone.h" +#include "QF/quakefs.h" #include "gib.h" #include "gib_instructions.h" #include "gib_interpret.h" diff --git a/nq/source/gib_instructions.c b/nq/source/gib_instructions.c index e32d80b03..92e453ea6 100644 --- a/nq/source/gib_instructions.c +++ b/nq/source/gib_instructions.c @@ -5,12 +5,12 @@ #include #include #include -#include "cvar.h" -#include "console.h" -#include "qargs.h" -#include "cmd.h" -#include "zone.h" -#include "quakefs.h" +#include "QF/cvar.h" +#include "QF/console.h" +#include "QF/qargs.h" +#include "QF/cmd.h" +#include "QF/zone.h" +#include "QF/quakefs.h" #include "gib.h" #include "gib_instructions.h" #include "gib_interpret.h" diff --git a/nq/source/gib_interpret.c b/nq/source/gib_interpret.c index 9a305ee13..a3c03b71d 100644 --- a/nq/source/gib_interpret.c +++ b/nq/source/gib_interpret.c @@ -5,12 +5,12 @@ #include #include #include -#include "cvar.h" -#include "console.h" -#include "qargs.h" -#include "cmd.h" -#include "zone.h" -#include "quakefs.h" +#include "QF/cvar.h" +#include "QF/console.h" +#include "QF/qargs.h" +#include "QF/cmd.h" +#include "QF/zone.h" +#include "QF/quakefs.h" #include "gib.h" #include "gib_instructions.h" #include "gib_interpret.h" diff --git a/nq/source/gib_modules.c b/nq/source/gib_modules.c index 36fae7a70..95f734ef7 100644 --- a/nq/source/gib_modules.c +++ b/nq/source/gib_modules.c @@ -6,12 +6,12 @@ #include #include -#include "cvar.h" -#include "console.h" -#include "qargs.h" -#include "cmd.h" -#include "zone.h" -#include "quakefs.h" +#include "QF/cvar.h" +#include "QF/console.h" +#include "QF/qargs.h" +#include "QF/cmd.h" +#include "QF/zone.h" +#include "QF/quakefs.h" #include "gib.h" #include "gib_instructions.h" #include "gib_interpret.h" diff --git a/nq/source/gib_parse.c b/nq/source/gib_parse.c index 1b2fc6309..f84bdd334 100644 --- a/nq/source/gib_parse.c +++ b/nq/source/gib_parse.c @@ -4,12 +4,12 @@ #include #include -#include "cvar.h" -#include "console.h" -#include "qargs.h" -#include "cmd.h" -#include "zone.h" -#include "quakefs.h" +#include "QF/cvar.h" +#include "QF/console.h" +#include "QF/qargs.h" +#include "QF/cmd.h" +#include "QF/zone.h" +#include "QF/quakefs.h" #include "gib.h" #include "gib_instructions.h" #include "gib_interpret.h" diff --git a/nq/source/gib_stack.c b/nq/source/gib_stack.c index 8a6a32f9d..821679367 100644 --- a/nq/source/gib_stack.c +++ b/nq/source/gib_stack.c @@ -5,12 +5,12 @@ #include #include #include -#include "cvar.h" -#include "console.h" -#include "qargs.h" -#include "cmd.h" -#include "zone.h" -#include "quakefs.h" +#include "QF/cvar.h" +#include "QF/console.h" +#include "QF/qargs.h" +#include "QF/cmd.h" +#include "QF/zone.h" +#include "QF/quakefs.h" #include "gib.h" #include "gib_instructions.h" #include "gib_interpret.h" diff --git a/nq/source/gib_vars.c b/nq/source/gib_vars.c index 03d780b7c..cd4326a6b 100644 --- a/nq/source/gib_vars.c +++ b/nq/source/gib_vars.c @@ -5,12 +5,12 @@ #include #include #include -#include "cvar.h" -#include "console.h" -#include "qargs.h" -#include "cmd.h" -#include "zone.h" -#include "quakefs.h" +#include "QF/cvar.h" +#include "QF/console.h" +#include "QF/qargs.h" +#include "QF/cmd.h" +#include "QF/zone.h" +#include "QF/quakefs.h" #include "gib.h" #include "gib_instructions.h" #include "gib_interpret.h" diff --git a/nq/source/gl_draw.c b/nq/source/gl_draw.c index 96c6a0a7e..7168fa3fe 100644 --- a/nq/source/gl_draw.c +++ b/nq/source/gl_draw.c @@ -36,25 +36,25 @@ #include #endif -#include "compat.h" +#include "QF/compat.h" #include "bspfile.h" // needed by: glquake.h #include "vid.h" -#include "sys.h" -#include "mathlib.h" // needed by: protocol.h, render.h, +#include "QF/sys.h" +#include "QF/mathlib.h" // needed by: protocol.h, render.h, // client.h, // modelgen.h, glmodel.h #include "wad.h" #include "draw.h" -#include "cvar.h" +#include "QF/cvar.h" #include "net.h" // needed by: client.h #include "protocol.h" // needed by: client.h -#include "cmd.h" +#include "QF/cmd.h" #include "sbar.h" #include "render.h" // needed by: client.h, model.h, // glquake.h #include "client.h" // need cls in this file #include "model.h" // needed by: glquake.h -#include "console.h" +#include "QF/console.h" #include "glquake.h" #include "view.h" diff --git a/nq/source/gl_mesh.c b/nq/source/gl_mesh.c index 089a251a4..a612c071f 100644 --- a/nq/source/gl_mesh.c +++ b/nq/source/gl_mesh.c @@ -38,10 +38,10 @@ #include -#include "console.h" -#include "mdfour.h" +#include "QF/console.h" +#include "QF/mdfour.h" #include "model.h" -#include "quakefs.h" +#include "QF/quakefs.h" /* ALIAS MODEL DISPLAY LIST GENERATION diff --git a/nq/source/gl_model_alias.c b/nq/source/gl_model_alias.c index c3b4d3ccd..9f4b536bb 100644 --- a/nq/source/gl_model_alias.c +++ b/nq/source/gl_model_alias.c @@ -34,10 +34,10 @@ #endif #include "r_local.h" -#include "sys.h" -#include "console.h" -#include "qendian.h" -#include "checksum.h" +#include "QF/sys.h" +#include "QF/console.h" +#include "QF/qendian.h" +#include "QF/checksum.h" #include "glquake.h" extern char loadname[]; diff --git a/nq/source/gl_model_brush.c b/nq/source/gl_model_brush.c index f5b816452..cee1b6068 100644 --- a/nq/source/gl_model_brush.c +++ b/nq/source/gl_model_brush.c @@ -34,10 +34,10 @@ #endif #include "r_local.h" -#include "sys.h" -#include "console.h" -#include "qendian.h" -#include "checksum.h" +#include "QF/sys.h" +#include "QF/console.h" +#include "QF/qendian.h" +#include "QF/checksum.h" #include "glquake.h" extern char loadname[]; diff --git a/nq/source/gl_model_fullbright.c b/nq/source/gl_model_fullbright.c index 78adf1f76..a6a2ba4f2 100644 --- a/nq/source/gl_model_fullbright.c +++ b/nq/source/gl_model_fullbright.c @@ -34,10 +34,10 @@ #endif #include "r_local.h" -#include "sys.h" -#include "console.h" -#include "qendian.h" -#include "checksum.h" +#include "QF/sys.h" +#include "QF/console.h" +#include "QF/qendian.h" +#include "QF/checksum.h" #include "glquake.h" int diff --git a/nq/source/gl_model_sprite.c b/nq/source/gl_model_sprite.c index 47c66832d..1071481c1 100644 --- a/nq/source/gl_model_sprite.c +++ b/nq/source/gl_model_sprite.c @@ -31,10 +31,10 @@ #endif #include "r_local.h" -#include "sys.h" -#include "console.h" -#include "qendian.h" -#include "checksum.h" +#include "QF/sys.h" +#include "QF/console.h" +#include "QF/qendian.h" +#include "QF/checksum.h" #include "glquake.h" extern char loadname[]; diff --git a/nq/source/gl_part.c b/nq/source/gl_part.c index 4be5e2554..c54021ffb 100644 --- a/nq/source/gl_part.c +++ b/nq/source/gl_part.c @@ -35,8 +35,8 @@ #include "r_local.h" #include "glquake.h" #include "server.h" -#include "console.h" -#include "cmd.h" +#include "QF/console.h" +#include "QF/cmd.h" #define MAX_FIRES 128 // rocket flames fire_t r_fires[MAX_FIRES]; diff --git a/nq/source/gl_refrag.c b/nq/source/gl_refrag.c index 18dbdaebb..57d53d766 100644 --- a/nq/source/gl_refrag.c +++ b/nq/source/gl_refrag.c @@ -33,8 +33,8 @@ #include "render.h" #include "model.h" #include "client.h" -#include "sys.h" -#include "console.h" +#include "QF/sys.h" +#include "QF/console.h" #include "glquake.h" mnode_t *r_pefragtopnode; diff --git a/nq/source/gl_rmain.c b/nq/source/gl_rmain.c index af674a6b1..d7ab854d8 100644 --- a/nq/source/gl_rmain.c +++ b/nq/source/gl_rmain.c @@ -35,9 +35,9 @@ #include #include -#include "compat.h" -#include "qargs.h" -#include "console.h" +#include "QF/compat.h" +#include "QF/qargs.h" +#include "QF/console.h" #include "r_local.h" #include "view.h" #include "game.h" @@ -45,7 +45,7 @@ #include "client.h" #include "model.h" #include "render.h" -#include "sys.h" +#include "QF/sys.h" #include "chase.h" entity_t r_worldentity; diff --git a/nq/source/gl_rmisc.c b/nq/source/gl_rmisc.c index ecf7df0a1..a065f9792 100644 --- a/nq/source/gl_rmisc.c +++ b/nq/source/gl_rmisc.c @@ -38,22 +38,22 @@ #include "bspfile.h" // needed by: glquake.h #include "vid.h" -#include "sys.h" -#include "mathlib.h" // needed by: protocol.h, render.h, +#include "QF/sys.h" +#include "QF/mathlib.h" // needed by: protocol.h, render.h, // client.h, // modelgen.h, glmodel.h #include "wad.h" #include "draw.h" -#include "cvar.h" +#include "QF/cvar.h" #include "net.h" // needed by: client.h #include "protocol.h" // needed by: client.h -#include "cmd.h" +#include "QF/cmd.h" #include "sbar.h" #include "render.h" // needed by: client.h, gl_model.h, // glquake.h #include "client.h" // need cls in this file #include "model.h" // needed by: glquake.h -#include "console.h" +#include "QF/console.h" #include "glquake.h" #include "r_local.h" diff --git a/nq/source/gl_rsurf.c b/nq/source/gl_rsurf.c index 0ef37a8e5..1f6f6c163 100644 --- a/nq/source/gl_rsurf.c +++ b/nq/source/gl_rsurf.c @@ -36,27 +36,27 @@ #include #include -#include "compat.h" +#include "QF/compat.h" #include "r_local.h" -#include "qargs.h" +#include "QF/qargs.h" #include "bspfile.h" // needed by: glquake.h #include "vid.h" -#include "sys.h" -#include "mathlib.h" // needed by: protocol.h, render.h, +#include "QF/sys.h" +#include "QF/mathlib.h" // needed by: protocol.h, render.h, // client.h, // modelgen.h, glmodel.h #include "wad.h" #include "draw.h" -#include "cvar.h" +#include "QF/cvar.h" #include "net.h" // needed by: client.h #include "protocol.h" // needed by: client.h -#include "cmd.h" +#include "QF/cmd.h" #include "sbar.h" #include "render.h" // needed by: client.h, gl_model.h, // glquake.h #include "client.h" // need cls in this file #include "model.h" // needed by: glquake.h -#include "console.h" +#include "QF/console.h" #include "glquake.h" extern double realtime; diff --git a/nq/source/gl_screen.c b/nq/source/gl_screen.c index c74695210..2126d1dee 100644 --- a/nq/source/gl_screen.c +++ b/nq/source/gl_screen.c @@ -36,22 +36,22 @@ #include #include -#include "compat.h" +#include "QF/compat.h" #include "input.h" -#include "qendian.h" +#include "QF/qendian.h" #include "bspfile.h" // needed by: glquake.h #include "vid.h" -#include "sys.h" -#include "mathlib.h" // needed by: protocol.h, render.h, +#include "QF/sys.h" +#include "QF/mathlib.h" // needed by: protocol.h, render.h, // client.h, // modelgen.h, glmodel.h #include "wad.h" #include "draw.h" -#include "cvar.h" +#include "QF/cvar.h" #include "net.h" // needed by: client.h #include "protocol.h" // needed by: client.h -#include "keys.h" -#include "cmd.h" +#include "QF/keys.h" +#include "QF/cmd.h" #include "sbar.h" #include "sound.h" #include "screen.h" @@ -59,7 +59,7 @@ // glquake.h #include "client.h" // need cls in this file #include "model.h" // needed by: glquake.h -#include "console.h" +#include "QF/console.h" #include "glquake.h" #include "view.h" #include "client.h" diff --git a/nq/source/gl_view.c b/nq/source/gl_view.c index 2874d2b2a..8a3ecbdae 100644 --- a/nq/source/gl_view.c +++ b/nq/source/gl_view.c @@ -34,8 +34,8 @@ #include "view.h" #include "client.h" #include "host.h" -#include "console.h" -#include "compat.h" +#include "QF/console.h" +#include "QF/compat.h" byte ramps[3][256]; float v_blend[4]; // rgba 0.0 - 1.0 diff --git a/nq/source/gl_warp.c b/nq/source/gl_warp.c index 61dd28edd..f473fa4a7 100644 --- a/nq/source/gl_warp.c +++ b/nq/source/gl_warp.c @@ -38,12 +38,12 @@ #include #endif -#include "qtypes.h" -#include "console.h" +#include "QF/qtypes.h" +#include "QF/console.h" #include "model.h" -#include "quakefs.h" +#include "QF/quakefs.h" #include "glquake.h" -#include "sys.h" +#include "QF/sys.h" extern double realtime; extern model_t *loadmodel; diff --git a/nq/source/host.c b/nq/source/host.c index 8d998343c..61694dbff 100644 --- a/nq/source/host.c +++ b/nq/source/host.c @@ -36,18 +36,18 @@ #include "server.h" #include "view.h" #include "chase.h" -#include "qargs.h" -#include "cmd.h" +#include "QF/qargs.h" +#include "QF/cmd.h" #include "cdaudio.h" -#include "va.h" +#include "QF/va.h" #include "sbar.h" -#include "msg.h" +#include "QF/msg.h" #include "vid.h" #include "draw.h" #include "input.h" -#include "keys.h" -#include "console.h" -#include "sys.h" +#include "QF/keys.h" +#include "QF/console.h" +#include "QF/sys.h" #include "screen.h" #include "gib.h" #include "sv_progs.h" diff --git a/nq/source/host_cmd.c b/nq/source/host_cmd.c index 690f83ae5..faf9158ed 100644 --- a/nq/source/host_cmd.c +++ b/nq/source/host_cmd.c @@ -33,15 +33,15 @@ #include "client.h" #include "server.h" #include "host.h" -#include "cmd.h" +#include "QF/cmd.h" #include "world.h" -#include "va.h" +#include "QF/va.h" #include "screen.h" -#include "msg.h" +#include "QF/msg.h" #include "model.h" -#include "console.h" -#include "keys.h" -#include "sys.h" +#include "QF/console.h" +#include "QF/keys.h" +#include "QF/sys.h" #include "sv_progs.h" int current_skill; diff --git a/nq/source/in_sdl.c b/nq/source/in_sdl.c index 694d8a4c8..a8fb6b7e5 100644 --- a/nq/source/in_sdl.c +++ b/nq/source/in_sdl.c @@ -33,16 +33,16 @@ #include #include "client.h" -#include "console.h" -#include "cvar.h" +#include "QF/console.h" +#include "QF/cvar.h" #include "draw.h" #include "host.h" #include "input.h" #include "joystick.h" -#include "keys.h" -#include "sys.h" -#include "qargs.h" -#include "qendian.h" +#include "QF/keys.h" +#include "QF/sys.h" +#include "QF/qargs.h" +#include "QF/qendian.h" #include "vid.h" #include "view.h" diff --git a/nq/source/in_svgalib.c b/nq/source/in_svgalib.c index 0d34ed1f7..17ebcba9e 100644 --- a/nq/source/in_svgalib.c +++ b/nq/source/in_svgalib.c @@ -44,15 +44,15 @@ #include #include "client.h" -#include "cmd.h" -#include "console.h" -#include "cvar.h" +#include "QF/cmd.h" +#include "QF/console.h" +#include "QF/cvar.h" #include "host.h" #include "input.h" #include "joystick.h" -#include "keys.h" -#include "qargs.h" -#include "sys.h" +#include "QF/keys.h" +#include "QF/qargs.h" +#include "QF/sys.h" #include "view.h" static int UseKeyboard = 1; diff --git a/nq/source/in_x11.c b/nq/source/in_x11.c index 6bdd6674c..7d2bc3c1d 100644 --- a/nq/source/in_x11.c +++ b/nq/source/in_x11.c @@ -57,17 +57,17 @@ #endif #include "client.h" -#include "console.h" +#include "QF/console.h" #include "context_x11.h" -#include "cmd.h" -#include "cvar.h" +#include "QF/cmd.h" +#include "QF/cvar.h" #include "dga_check.h" #include "host.h" #include "input.h" #include "joystick.h" -#include "keys.h" -#include "qargs.h" -#include "sys.h" +#include "QF/keys.h" +#include "QF/qargs.h" +#include "QF/sys.h" #include "view.h" cvar_t *_windowed_mouse; diff --git a/nq/source/joy_linux.c b/nq/source/joy_linux.c index 0feafc643..43a8d810e 100644 --- a/nq/source/joy_linux.c +++ b/nq/source/joy_linux.c @@ -36,10 +36,10 @@ #include #include -#include "console.h" +#include "QF/console.h" #include "client.h" -#include "cvar.h" -#include "keys.h" +#include "QF/cvar.h" +#include "QF/keys.h" #include "protocol.h" #include "view.h" diff --git a/nq/source/keys.c b/nq/source/keys.c index 081e9815b..96193e5d6 100644 --- a/nq/source/keys.c +++ b/nq/source/keys.c @@ -43,12 +43,12 @@ #include #include "client.h" -#include "cmd.h" -#include "console.h" -#include "cvar.h" -#include "keys.h" +#include "QF/cmd.h" +#include "QF/console.h" +#include "QF/cvar.h" +#include "QF/keys.h" #include "screen.h" -#include "sys.h" +#include "QF/sys.h" /* diff --git a/nq/source/model.c b/nq/source/model.c index 3a4bf5433..0479c4762 100644 --- a/nq/source/model.c +++ b/nq/source/model.c @@ -34,10 +34,10 @@ #endif #include "r_local.h" -#include "sys.h" -#include "console.h" -#include "qendian.h" -#include "checksum.h" +#include "QF/sys.h" +#include "QF/console.h" +#include "QF/qendian.h" +#include "QF/checksum.h" model_t *loadmodel; char loadname[32]; // for hunk tags diff --git a/nq/source/model_alias.c b/nq/source/model_alias.c index a2b2d9b59..819c04c8e 100644 --- a/nq/source/model_alias.c +++ b/nq/source/model_alias.c @@ -34,10 +34,10 @@ #endif #include "r_local.h" -#include "sys.h" -#include "console.h" -#include "qendian.h" -#include "checksum.h" +#include "QF/sys.h" +#include "QF/console.h" +#include "QF/qendian.h" +#include "QF/checksum.h" extern char loadname[]; extern model_t *loadmodel; diff --git a/nq/source/model_brush.c b/nq/source/model_brush.c index 61d42df48..8efafd08a 100644 --- a/nq/source/model_brush.c +++ b/nq/source/model_brush.c @@ -40,10 +40,10 @@ #endif #include "r_local.h" -#include "sys.h" -#include "console.h" -#include "qendian.h" -#include "checksum.h" +#include "QF/sys.h" +#include "QF/console.h" +#include "QF/qendian.h" +#include "QF/checksum.h" byte *mod_base; diff --git a/nq/source/model_sprite.c b/nq/source/model_sprite.c index e7dbb62a2..ceb7cedd8 100644 --- a/nq/source/model_sprite.c +++ b/nq/source/model_sprite.c @@ -34,10 +34,10 @@ #endif #include "r_local.h" -#include "sys.h" -#include "console.h" -#include "qendian.h" -#include "checksum.h" +#include "QF/sys.h" +#include "QF/console.h" +#include "QF/qendian.h" +#include "QF/checksum.h" extern char loadname[]; extern model_t *loadmodel; diff --git a/nq/source/net_dgrm.c b/nq/source/net_dgrm.c index f3e194075..0ba0c3b27 100644 --- a/nq/source/net_dgrm.c +++ b/nq/source/net_dgrm.c @@ -33,16 +33,16 @@ #include -#include "cmd.h" -#include "sys.h" -#include "keys.h" +#include "QF/cmd.h" +#include "QF/sys.h" +#include "QF/keys.h" #include "client.h" #include "server.h" -#include "qendian.h" -#include "msg.h" -#include "qargs.h" +#include "QF/qendian.h" +#include "QF/msg.h" +#include "QF/qargs.h" #include "screen.h" -#include "console.h" +#include "QF/console.h" #include "net.h" #include "game.h" #include "sv_progs.h" diff --git a/nq/source/net_loop.c b/nq/source/net_loop.c index 6f697c33f..d76577cca 100644 --- a/nq/source/net_loop.c +++ b/nq/source/net_loop.c @@ -30,12 +30,12 @@ # include "config.h" #endif -#include "msg.h" +#include "QF/msg.h" #include "net.h" #include "net_loop.h" #include "client.h" -#include "console.h" -#include "sys.h" +#include "QF/console.h" +#include "QF/sys.h" #include "server.h" qboolean localconnectpending = false; diff --git a/nq/source/net_main.c b/nq/source/net_main.c index e24f147ee..0ee2fa1be 100644 --- a/nq/source/net_main.c +++ b/nq/source/net_main.c @@ -32,14 +32,14 @@ #include -#include "cmd.h" -#include "msg.h" +#include "QF/cmd.h" +#include "QF/msg.h" #include "net.h" #include "net_vcr.h" -#include "qargs.h" -#include "sizebuf.h" -#include "console.h" -#include "sys.h" +#include "QF/qargs.h" +#include "QF/sizebuf.h" +#include "QF/console.h" +#include "QF/sys.h" #include "server.h" qsocket_t *net_activeSockets = NULL; diff --git a/nq/source/net_udp.c b/nq/source/net_udp.c index 8b48a637a..2ff5694ef 100644 --- a/nq/source/net_udp.c +++ b/nq/source/net_udp.c @@ -54,9 +54,9 @@ #endif #include "net.h" -#include "qargs.h" -#include "sys.h" -#include "console.h" +#include "QF/qargs.h" +#include "QF/sys.h" +#include "QF/console.h" //extern int gethostname (char *, int); extern int close (int); diff --git a/nq/source/net_vcr.c b/nq/source/net_vcr.c index 84017d789..ac91c3565 100644 --- a/nq/source/net_vcr.c +++ b/nq/source/net_vcr.c @@ -30,11 +30,12 @@ # include "config.h" #endif -#include "msg.h" +#include "QF/msg.h" #include "net.h" #include "net_vcr.h" -#include "sys.h" +#include "QF/sys.h" #include "server.h" + extern int vcrFile; // This is the playback portion of the VCR. It reads the file produced diff --git a/nq/source/pr_cmds.c b/nq/source/pr_cmds.c index 80d4f7d97..5b8915dfa 100644 --- a/nq/source/pr_cmds.c +++ b/nq/source/pr_cmds.c @@ -32,13 +32,13 @@ #include -#include "console.h" -#include "sys.h" -#include "cmd.h" -#include "va.h" +#include "QF/console.h" +#include "QF/sys.h" +#include "QF/cmd.h" +#include "QF/va.h" #include "host.h" #include "world.h" -#include "msg.h" +#include "QF/msg.h" #include "server.h" #include "sv_progs.h" diff --git a/nq/source/quakefs.c b/nq/source/quakefs.c index a88c8056f..77db91919 100644 --- a/nq/source/quakefs.c +++ b/nq/source/quakefs.c @@ -61,20 +61,20 @@ #include -#include "cmd.h" -#include "console.h" -#include "cvar.h" +#include "QF/cmd.h" +#include "QF/console.h" +#include "QF/cvar.h" #include "draw.h" -#include "hash.h" +#include "QF/hash.h" #include "host.h" -#include "info.h" -#include "qargs.h" -#include "qendian.h" -#include "qtypes.h" -#include "quakefs.h" +#include "QF/info.h" +#include "QF/qargs.h" +#include "QF/qendian.h" +#include "QF/qtypes.h" +#include "QF/quakefs.h" #include "server.h" -#include "sys.h" -#include "va.h" +#include "QF/sys.h" +#include "QF/va.h" #ifndef HAVE_FNMATCH_PROTO int fnmatch (const char *__pattern, const char *__string, int __flags); diff --git a/nq/source/quakeio.c b/nq/source/quakeio.c index b604edbaa..075a7a309 100644 --- a/nq/source/quakeio.c +++ b/nq/source/quakeio.c @@ -36,7 +36,6 @@ #endif #include #include -#include #include #ifdef WIN32 # include @@ -48,6 +47,8 @@ # include #endif +#include "QF/quakeio.h" + #ifdef _MSC_VER # define _POSIX_ #endif diff --git a/nq/source/r_alias.c b/nq/source/r_alias.c index 724421c96..f093986dd 100644 --- a/nq/source/r_alias.c +++ b/nq/source/r_alias.c @@ -30,8 +30,8 @@ # include "config.h" #endif -#include "console.h" -#include "sys.h" +#include "QF/console.h" +#include "QF/sys.h" #include "r_local.h" #include "d_local.h" // FIXME: shouldn't be needed (is // needed for patch diff --git a/nq/source/r_bsp.c b/nq/source/r_bsp.c index 098cfdba7..a71d080d7 100644 --- a/nq/source/r_bsp.c +++ b/nq/source/r_bsp.c @@ -31,8 +31,8 @@ #endif #include "r_local.h" -#include "console.h" -#include "sys.h" +#include "QF/console.h" +#include "QF/sys.h" // // current entity info diff --git a/nq/source/r_efrag.c b/nq/source/r_efrag.c index bfa15ffb0..c10d67b05 100644 --- a/nq/source/r_efrag.c +++ b/nq/source/r_efrag.c @@ -30,8 +30,8 @@ # include "config.h" #endif -#include "console.h" -#include "sys.h" +#include "QF/console.h" +#include "QF/sys.h" #include "r_local.h" mnode_t *r_pefragtopnode; diff --git a/nq/source/r_main.c b/nq/source/r_main.c index 4dfd72e26..f472f8a7e 100644 --- a/nq/source/r_main.c +++ b/nq/source/r_main.c @@ -31,10 +31,10 @@ #endif #include "r_local.h" -#include "sys.h" -#include "console.h" +#include "QF/sys.h" +#include "QF/console.h" #include "view.h" -#include "cmd.h" +#include "QF/cmd.h" #include "screen.h" #include "chase.h" diff --git a/nq/source/r_misc.c b/nq/source/r_misc.c index a0084020a..c9e406566 100644 --- a/nq/source/r_misc.c +++ b/nq/source/r_misc.c @@ -31,8 +31,8 @@ #endif #include "r_local.h" -#include "sys.h" -#include "console.h" +#include "QF/sys.h" +#include "QF/console.h" #include "server.h" #include "host.h" #include "view.h" diff --git a/nq/source/r_part.c b/nq/source/r_part.c index f6fbf1c68..68bff39eb 100644 --- a/nq/source/r_part.c +++ b/nq/source/r_part.c @@ -32,10 +32,10 @@ #endif #include "r_local.h" -#include "qargs.h" -#include "console.h" +#include "QF/qargs.h" +#include "QF/console.h" #include "server.h" -#include "msg.h" +#include "QF/msg.h" #define MAX_PARTICLES 2048 // default max # of particles at one // time diff --git a/nq/source/r_sprite.c b/nq/source/r_sprite.c index b0613ac3f..85afd687d 100644 --- a/nq/source/r_sprite.c +++ b/nq/source/r_sprite.c @@ -32,8 +32,8 @@ #endif #include "r_local.h" -#include "sys.h" -#include "console.h" +#include "QF/sys.h" +#include "QF/console.h" static int clip_current; static vec5_t clip_verts[2][MAXWORKINGVERTS]; diff --git a/nq/source/r_surf.c b/nq/source/r_surf.c index 45805d2d5..4fa773310 100644 --- a/nq/source/r_surf.c +++ b/nq/source/r_surf.c @@ -31,7 +31,7 @@ #endif #include "r_local.h" -#include "sys.h" +#include "QF/sys.h" drawsurf_t r_drawsurf; diff --git a/nq/source/r_view.c b/nq/source/r_view.c index 91d3933f1..eca431b38 100644 --- a/nq/source/r_view.c +++ b/nq/source/r_view.c @@ -33,12 +33,12 @@ #include "view.h" #include "r_local.h" #include "host.h" -#include "cmd.h" +#include "QF/cmd.h" #include "chase.h" #include "draw.h" #include "screen.h" -#include "console.h" -#include "msg.h" +#include "QF/console.h" +#include "QF/msg.h" /* diff --git a/nq/source/sbar.c b/nq/source/sbar.c index 3d01dfd6f..83fe8c8f0 100644 --- a/nq/source/sbar.c +++ b/nq/source/sbar.c @@ -31,12 +31,12 @@ # include "config.h" #endif -#include "compat.h" +#include "QF/compat.h" #include "sbar.h" #include "game.h" -#include "cmd.h" +#include "QF/cmd.h" #include "vid.h" -#include "va.h" +#include "QF/va.h" #include "draw.h" #include "wad.h" #include "screen.h" diff --git a/nq/source/screen.c b/nq/source/screen.c index d60ec9510..787dda716 100644 --- a/nq/source/screen.c +++ b/nq/source/screen.c @@ -32,16 +32,16 @@ #include #include "r_local.h" -#include "cmd.h" +#include "QF/cmd.h" #include "screen.h" #include "sbar.h" #include "input.h" #include "view.h" #include "host.h" -#include "sys.h" -#include "console.h" -#include "qendian.h" -#include "keys.h" +#include "QF/sys.h" +#include "QF/console.h" +#include "QF/qendian.h" +#include "QF/keys.h" #include "draw.h" // only the refresh window will be updated unless these variables are flagged diff --git a/nq/source/snd_alsa_0_9.c b/nq/source/snd_alsa_0_9.c index 805250451..b289b1d05 100644 --- a/nq/source/snd_alsa_0_9.c +++ b/nq/source/snd_alsa_0_9.c @@ -35,10 +35,10 @@ #include -#include "qtypes.h" +#include "QF/qtypes.h" #include "sound.h" -#include "qargs.h" -#include "console.h" +#include "QF/qargs.h" +#include "QF/console.h" static int snd_inited; diff --git a/nq/source/snd_dma.c b/nq/source/snd_dma.c index 74873cb96..ad1c753ef 100644 --- a/nq/source/snd_dma.c +++ b/nq/source/snd_dma.c @@ -33,12 +33,12 @@ #include #include -#include "sys.h" +#include "QF/sys.h" #include "sound.h" -#include "cmd.h" -#include "console.h" +#include "QF/cmd.h" +#include "QF/console.h" #include "client.h" -#include "qargs.h" +#include "QF/qargs.h" #include "host.h" #ifdef _WIN32 diff --git a/nq/source/snd_mem.c b/nq/source/snd_mem.c index 081a253fe..d13c65f15 100644 --- a/nq/source/snd_mem.c +++ b/nq/source/snd_mem.c @@ -32,11 +32,11 @@ #include -#include "sys.h" +#include "QF/sys.h" #include "sound.h" -#include "qendian.h" -#include "quakefs.h" -#include "console.h" +#include "QF/qendian.h" +#include "QF/quakefs.h" +#include "QF/console.h" int cache_full_cycle; diff --git a/nq/source/snd_mix.c b/nq/source/snd_mix.c index 84bb40d83..6b2f0dc5e 100644 --- a/nq/source/snd_mix.c +++ b/nq/source/snd_mix.c @@ -31,7 +31,7 @@ #endif #include "sound.h" -#include "compat.h" +#include "QF/compat.h" #ifdef _WIN32 #include "winquake.h" diff --git a/nq/source/sv_cvar.c b/nq/source/sv_cvar.c index 05f902d8a..bafc9f47c 100644 --- a/nq/source/sv_cvar.c +++ b/nq/source/sv_cvar.c @@ -34,7 +34,7 @@ # include #endif -#include "cvar.h" +#include "QF/cvar.h" #include "server.h" void diff --git a/nq/source/sv_main.c b/nq/source/sv_main.c index 81d972a18..4c6694844 100644 --- a/nq/source/sv_main.c +++ b/nq/source/sv_main.c @@ -32,10 +32,10 @@ #endif #include "server.h" -#include "msg.h" -#include "console.h" -#include "sys.h" -#include "cmd.h" +#include "QF/msg.h" +#include "QF/console.h" +#include "QF/sys.h" +#include "QF/cmd.h" #include "host.h" #include "world.h" #include "sv_progs.h" diff --git a/nq/source/sv_phys.c b/nq/source/sv_phys.c index be5ec2f1c..b321998f2 100644 --- a/nq/source/sv_phys.c +++ b/nq/source/sv_phys.c @@ -33,9 +33,9 @@ #include "server.h" #include "host.h" #include "world.h" -#include "console.h" +#include "QF/console.h" #include "sv_progs.h" -#include "sys.h" +#include "QF/sys.h" /* diff --git a/nq/source/sv_progs.c b/nq/source/sv_progs.c index 20a909044..9c66a35c6 100644 --- a/nq/source/sv_progs.c +++ b/nq/source/sv_progs.c @@ -37,8 +37,8 @@ #include "strings.h" #endif -#include "cmd.h" -#include "console.h" +#include "QF/cmd.h" +#include "QF/console.h" #include "host.h" #include "progdefs.h" #include "server.h" diff --git a/nq/source/sv_user.c b/nq/source/sv_user.c index 9812b9f74..41a3e42ae 100644 --- a/nq/source/sv_user.c +++ b/nq/source/sv_user.c @@ -32,15 +32,15 @@ #endif #include "server.h" -#include "msg.h" -#include "console.h" +#include "QF/msg.h" +#include "QF/console.h" #include "world.h" -#include "keys.h" +#include "QF/keys.h" #include "view.h" -#include "cmd.h" +#include "QF/cmd.h" #include "host.h" #include "sv_progs.h" -#include "sys.h" +#include "QF/sys.h" edict_t *sv_player; diff --git a/nq/source/sw_model_alias.c b/nq/source/sw_model_alias.c index ec2477ed9..ce91c23da 100644 --- a/nq/source/sw_model_alias.c +++ b/nq/source/sw_model_alias.c @@ -34,10 +34,10 @@ #endif #include "r_local.h" -#include "sys.h" -#include "console.h" -#include "qendian.h" -#include "checksum.h" +#include "QF/sys.h" +#include "QF/console.h" +#include "QF/qendian.h" +#include "QF/checksum.h" extern char loadname[]; extern model_t *loadmodel; diff --git a/nq/source/sw_model_brush.c b/nq/source/sw_model_brush.c index 8f2cc1167..27e497e1f 100644 --- a/nq/source/sw_model_brush.c +++ b/nq/source/sw_model_brush.c @@ -31,10 +31,10 @@ #endif #include "r_local.h" -#include "sys.h" -#include "console.h" -#include "qendian.h" -#include "checksum.h" +#include "QF/sys.h" +#include "QF/console.h" +#include "QF/qendian.h" +#include "QF/checksum.h" extern char loadname[]; extern model_t *loadmodel; diff --git a/nq/source/sw_model_sprite.c b/nq/source/sw_model_sprite.c index 5b1db3fb7..296888727 100644 --- a/nq/source/sw_model_sprite.c +++ b/nq/source/sw_model_sprite.c @@ -31,10 +31,10 @@ #endif #include "r_local.h" -#include "sys.h" -#include "console.h" -#include "qendian.h" -#include "checksum.h" +#include "QF/sys.h" +#include "QF/console.h" +#include "QF/qendian.h" +#include "QF/checksum.h" extern char loadname[]; diff --git a/nq/source/sw_view.c b/nq/source/sw_view.c index 5ad599575..567f6c258 100644 --- a/nq/source/sw_view.c +++ b/nq/source/sw_view.c @@ -31,10 +31,10 @@ # include "config.h" #endif -#include "compat.h" +#include "QF/compat.h" #include "view.h" #include "vid.h" -#include "console.h" +#include "QF/console.h" #include "host.h" #include "client.h" #include "draw.h" diff --git a/nq/source/sys_unix.c b/nq/source/sys_unix.c index 74d76dc88..ab48c5afb 100644 --- a/nq/source/sys_unix.c +++ b/nq/source/sys_unix.c @@ -43,9 +43,9 @@ #include #include -#include "sys.h" -#include "qargs.h" -#include "cvar.h" +#include "QF/sys.h" +#include "QF/qargs.h" +#include "QF/cvar.h" #include "server.h" #include "host.h" diff --git a/nq/source/vid.c b/nq/source/vid.c index 3d49c4692..48793b54f 100644 --- a/nq/source/vid.c +++ b/nq/source/vid.c @@ -30,11 +30,11 @@ # include "config.h" #endif -#include "cvar.h" +#include "QF/cvar.h" #include "vid.h" -#include "va.h" -#include "qargs.h" -#include "sys.h" +#include "QF/va.h" +#include "QF/qargs.h" +#include "QF/sys.h" extern viddef_t vid; // global video state diff --git a/nq/source/vid_common_gl.c b/nq/source/vid_common_gl.c index 365c768af..d99d51d65 100644 --- a/nq/source/vid_common_gl.c +++ b/nq/source/vid_common_gl.c @@ -50,11 +50,11 @@ # endif #endif -#include "console.h" +#include "QF/console.h" #include "glquake.h" #include "input.h" -#include "qargs.h" -#include "quakefs.h" +#include "QF/qargs.h" +#include "QF/quakefs.h" #include "sbar.h" #define WARP_WIDTH 320 diff --git a/nq/source/vid_glx.c b/nq/source/vid_glx.c index e7234c2f5..85ba4b204 100644 --- a/nq/source/vid_glx.c +++ b/nq/source/vid_glx.c @@ -43,17 +43,17 @@ # include #endif -#include "compat.h" -#include "console.h" +#include "QF/compat.h" +#include "QF/console.h" #include "context_x11.h" #include "glquake.h" #include "host.h" #include "input.h" -#include "qargs.h" -#include "qendian.h" -#include "quakefs.h" +#include "QF/qargs.h" +#include "QF/qendian.h" +#include "QF/quakefs.h" #include "sbar.h" -#include "va.h" +#include "QF/va.h" #define WARP_WIDTH 320 #define WARP_HEIGHT 200 diff --git a/nq/source/vid_sdl.c b/nq/source/vid_sdl.c index 3ae9e94f3..ad7ff8ee5 100644 --- a/nq/source/vid_sdl.c +++ b/nq/source/vid_sdl.c @@ -37,12 +37,12 @@ #endif #include -#include "cvar.h" +#include "QF/cvar.h" #include "d_local.h" #include "host.h" -#include "qendian.h" -#include "sys.h" -#include "va.h" +#include "QF/qendian.h" +#include "QF/sys.h" +#include "QF/va.h" #include "vid.h" // static float oldin_grab = 0; diff --git a/nq/source/vid_sgl.c b/nq/source/vid_sgl.c index 5dbb508aa..8315637a5 100644 --- a/nq/source/vid_sgl.c +++ b/nq/source/vid_sgl.c @@ -39,14 +39,14 @@ #endif #include -#include "compat.h" -#include "console.h" +#include "QF/compat.h" +#include "QF/console.h" #include "host.h" -#include "qargs.h" -#include "qendian.h" +#include "QF/qargs.h" +#include "QF/qendian.h" #include "sbar.h" -#include "sys.h" -#include "va.h" +#include "QF/sys.h" +#include "QF/va.h" #include "glquake.h" #define WARP_WIDTH 320 diff --git a/nq/source/vid_svgalib.c b/nq/source/vid_svgalib.c index 346cd2bfb..a44d1fd45 100644 --- a/nq/source/vid_svgalib.c +++ b/nq/source/vid_svgalib.c @@ -48,15 +48,15 @@ #include -#include "cmd.h" -#include "console.h" -#include "cvar.h" +#include "QF/cmd.h" +#include "QF/console.h" +#include "QF/cvar.h" #include "d_local.h" #include "host.h" #include "input.h" -#include "qargs.h" -#include "qendian.h" -#include "sys.h" +#include "QF/qargs.h" +#include "QF/qendian.h" +#include "QF/sys.h" void VGA_UpdatePlanarScreen (void *srcbuffer); diff --git a/nq/source/vid_x11.c b/nq/source/vid_x11.c index 4e875f21f..1c544c1bd 100644 --- a/nq/source/vid_x11.c +++ b/nq/source/vid_x11.c @@ -52,17 +52,17 @@ #include #include -#include "qendian.h" -#include "qargs.h" +#include "QF/qendian.h" +#include "QF/qargs.h" #include "d_local.h" -#include "keys.h" -#include "cvar.h" -#include "sys.h" -#include "cmd.h" +#include "QF/keys.h" +#include "QF/cvar.h" +#include "QF/sys.h" +#include "QF/cmd.h" #include "input.h" #include "draw.h" -#include "console.h" -#include "va.h" +#include "QF/console.h" +#include "QF/va.h" #include "client.h" #include "input.h" #include "context_x11.h" diff --git a/nq/source/wad.c b/nq/source/wad.c index 8c0aa19a5..bec02015d 100644 --- a/nq/source/wad.c +++ b/nq/source/wad.c @@ -30,10 +30,11 @@ # include "config.h" #endif -#include "qendian.h" +#include "QF/qendian.h" #include "wad.h" -#include "sys.h" -#include "quakefs.h" +#include "QF/sys.h" +#include "QF/quakefs.h" + int wad_numlumps; lumpinfo_t *wad_lumps; byte *wad_base; diff --git a/nq/source/world.c b/nq/source/world.c index 21c0c579c..3f510530e 100644 --- a/nq/source/world.c +++ b/nq/source/world.c @@ -34,8 +34,8 @@ #include "world.h" #include "model.h" #include "server.h" -#include "sys.h" -#include "console.h" +#include "QF/sys.h" +#include "QF/console.h" #include "sv_progs.h" /* diff --git a/qw/include/bspfile.h b/qw/include/bspfile.h index 50eff02b9..169edb669 100644 --- a/qw/include/bspfile.h +++ b/qw/include/bspfile.h @@ -28,7 +28,7 @@ #ifndef __bspfile_h_ #define __bspfile_h_ -#include "qtypes.h" +#include "QF/qtypes.h" // upper design bounds diff --git a/qw/include/cdaudio.h b/qw/include/cdaudio.h index ac3a0f046..c9d9d1e63 100644 --- a/qw/include/cdaudio.h +++ b/qw/include/cdaudio.h @@ -29,7 +29,7 @@ #ifndef _CDAUDIO_H #define _CDAUDIO_H -#include "qtypes.h" +#include "QF/qtypes.h" int CDAudio_Init(void); void CDAudio_Play(byte track, qboolean looping); diff --git a/qw/include/cl_demo.h b/qw/include/cl_demo.h index 71f37a5ff..437803d8f 100644 --- a/qw/include/cl_demo.h +++ b/qw/include/cl_demo.h @@ -29,7 +29,7 @@ #ifndef _CL_DEMO_H #define _CL_DEMO_H -#include "qtypes.h" +#include "QF/qtypes.h" #include "protocol.h" void CL_StopPlayback (void); diff --git a/qw/include/cl_ents.h b/qw/include/cl_ents.h index 25e3bcedd..5e0e5df53 100644 --- a/qw/include/cl_ents.h +++ b/qw/include/cl_ents.h @@ -29,7 +29,7 @@ #ifndef _CL_ENTS_H #define _CL_ENTS_H -#include "qtypes.h" +#include "QF/qtypes.h" void CL_SetSolidPlayers (int playernum); void CL_SetUpPlayerPrediction(qboolean dopred); diff --git a/qw/include/cl_main.h b/qw/include/cl_main.h index 3f28f0000..4715dd59b 100644 --- a/qw/include/cl_main.h +++ b/qw/include/cl_main.h @@ -30,7 +30,7 @@ #define _CL_MAIN_H #include "client.h" -#include "qtypes.h" +#include "QF/qtypes.h" #include "render.h" dlight_t *CL_AllocDlight (int key); diff --git a/qw/include/cl_parse.h b/qw/include/cl_parse.h index 8f36fc64e..4833d964c 100644 --- a/qw/include/cl_parse.h +++ b/qw/include/cl_parse.h @@ -29,7 +29,7 @@ #ifndef _CL_PARSE_H #define _CL_PARSE_H -#include "qtypes.h" +#include "QF/qtypes.h" #define NET_TIMINGS 256 #define NET_TIMINGSMASK 255 diff --git a/qw/include/cl_slist.h b/qw/include/cl_slist.h index a05170a55..3f093f649 100644 --- a/qw/include/cl_slist.h +++ b/qw/include/cl_slist.h @@ -31,7 +31,7 @@ #ifndef _CL_SLIST_H #define _CL_SLIST_H -#include "quakeio.h" +#include "QF/quakeio.h" typedef struct server_entry_s { char *server; diff --git a/qw/include/client.h b/qw/include/client.h index 63fa84655..80c194fc9 100644 --- a/qw/include/client.h +++ b/qw/include/client.h @@ -29,13 +29,13 @@ #ifndef _CLIENT_H #define _CLIENT_H -#include "info.h" +#include "QF/info.h" #include "net.h" #include "protocol.h" -#include "quakefs.h" +#include "QF/quakefs.h" #include "render.h" #include "vid.h" -#include "zone.h" +#include "QF/zone.h" // player_state_t is the information needed by a player entity // to do move prediction and to generate a drawable entity diff --git a/qw/include/commdef.h b/qw/include/commdef.h index 69e9ab932..e6382de61 100644 --- a/qw/include/commdef.h +++ b/qw/include/commdef.h @@ -34,8 +34,8 @@ # include "config.h" #endif -#include "gcc_attr.h" -#include "qtypes.h" +#include "QF/gcc_attr.h" +#include "QF/qtypes.h" /* The host system specifies the base of the directory tree, the command line parms passed to the program, and the amount of memory diff --git a/qw/include/context_x11.h b/qw/include/context_x11.h index 27836964c..6058bfc78 100644 --- a/qw/include/context_x11.h +++ b/qw/include/context_x11.h @@ -34,7 +34,7 @@ #include #include -#include "qtypes.h" +#include "QF/qtypes.h" void GetEvent( void ); diff --git a/qw/include/d_iface.h b/qw/include/d_iface.h index eae297a18..fe9665d94 100644 --- a/qw/include/d_iface.h +++ b/qw/include/d_iface.h @@ -29,7 +29,7 @@ #ifndef _D_IFACE_H #define _D_IFACE_H -#include "mathlib.h" +#include "QF/mathlib.h" #include "model.h" #define WARP_WIDTH 320 diff --git a/qw/include/dga_check.h b/qw/include/dga_check.h index 881d55310..f3d5f16da 100644 --- a/qw/include/dga_check.h +++ b/qw/include/dga_check.h @@ -32,7 +32,7 @@ #include -#include "qtypes.h" +#include "QF/qtypes.h" /* VID_CheckDGA diff --git a/qw/include/glquake.h b/qw/include/glquake.h index 8600d6c32..cd283edc3 100644 --- a/qw/include/glquake.h +++ b/qw/include/glquake.h @@ -40,7 +40,7 @@ #include #include "client.h" -#include "cvar.h" +#include "QF/cvar.h" #include "model.h" #include "render.h" #include "qfgl_ext.h" diff --git a/qw/include/host.h b/qw/include/host.h index 915ae1223..ad7c3b0e1 100644 --- a/qw/include/host.h +++ b/qw/include/host.h @@ -30,8 +30,8 @@ #define _QUAKEDEF_H #include "commdef.h" -#include "gcc_attr.h" -#include "qtypes.h" +#include "QF/gcc_attr.h" +#include "QF/qtypes.h" #define QUAKE_GAME // as opposed to utilities diff --git a/qw/include/input.h b/qw/include/input.h index 355226f0d..49e6efda2 100644 --- a/qw/include/input.h +++ b/qw/include/input.h @@ -30,7 +30,7 @@ #define _INPUT_H #include "protocol.h" -#include "cvar.h" +#include "QF/cvar.h" #define freelook (in_mlook.state&1 || cl_freelook->int_val) diff --git a/qw/include/joystick.h b/qw/include/joystick.h index ea9dfadb6..de5bc3aea 100644 --- a/qw/include/joystick.h +++ b/qw/include/joystick.h @@ -30,7 +30,7 @@ # include "config.h" #endif -#include "cvar.h" +#include "QF/cvar.h" #include "protocol.h" extern cvar_t *joy_device; // Joystick device name diff --git a/qw/include/locs.h b/qw/include/locs.h index 14c7ee56f..dd07b870f 100644 --- a/qw/include/locs.h +++ b/qw/include/locs.h @@ -29,7 +29,7 @@ #ifndef __locs_h #define __locs_h -#include "qtypes.h" +#include "QF/qtypes.h" typedef struct { diff --git a/qw/include/model.h b/qw/include/model.h index 2ff79b233..1ba108db1 100644 --- a/qw/include/model.h +++ b/qw/include/model.h @@ -29,12 +29,12 @@ #ifndef _MODEL_H #define _MODEL_H -#include "qtypes.h" +#include "QF/qtypes.h" #include "render.h" #include "bspfile.h" #include "spritegn.h" #include "modelgen.h" -#include "zone.h" +#include "QF/zone.h" /* diff --git a/qw/include/modelgen.h b/qw/include/modelgen.h index cf43b42fa..f17df7dec 100644 --- a/qw/include/modelgen.h +++ b/qw/include/modelgen.h @@ -35,7 +35,7 @@ #ifndef _MODELGEN_H #define _MODELGEN_H -#include "mathlib.h" +#include "QF/mathlib.h" #define ALIAS_VERSION 6 diff --git a/qw/include/msg_ucmd.h b/qw/include/msg_ucmd.h index 5b4113044..b5a19e4da 100644 --- a/qw/include/msg_ucmd.h +++ b/qw/include/msg_ucmd.h @@ -28,7 +28,7 @@ #ifndef __msg_ucmd_h #define __msg_ucmd_h -#include "sizebuf.h" +#include "QF/sizebuf.h" extern struct usercmd_s nullcmd; diff --git a/qw/include/net.h b/qw/include/net.h index cf136035e..5b96f44c8 100644 --- a/qw/include/net.h +++ b/qw/include/net.h @@ -29,9 +29,9 @@ #ifndef _NET_H #define _NET_H -#include "gcc_attr.h" -#include "sizebuf.h" -#include "cvar.h" +#include "QF/gcc_attr.h" +#include "QF/sizebuf.h" +#include "QF/cvar.h" #define PORT_ANY -1 diff --git a/qw/include/pcx.h b/qw/include/pcx.h index 9a989d65e..c5b6ec1a0 100644 --- a/qw/include/pcx.h +++ b/qw/include/pcx.h @@ -29,7 +29,7 @@ #ifndef __pcx_h #define __pcx_h -#include "quakeio.h" +#include "QF/quakeio.h" typedef struct { diff --git a/qw/include/pmove.h b/qw/include/pmove.h index 59ef63d29..9079bb727 100644 --- a/qw/include/pmove.h +++ b/qw/include/pmove.h @@ -30,7 +30,7 @@ #define _PMOVE_H #include "protocol.h" -#include "mathlib.h" +#include "QF/mathlib.h" #include "model.h" #define STOP_EPSILON 0.1 diff --git a/qw/include/protocol.h b/qw/include/protocol.h index 11572caba..28e6fa0cf 100644 --- a/qw/include/protocol.h +++ b/qw/include/protocol.h @@ -30,7 +30,7 @@ #ifndef _PROTOCOL_H #define _PROTOCOL_H -#include "mathlib.h" +#include "QF/mathlib.h" #define PROTOCOL_VERSION 28 diff --git a/qw/include/qfgl_ext.h b/qw/include/qfgl_ext.h index 04c17b386..a6f830a4c 100644 --- a/qw/include/qfgl_ext.h +++ b/qw/include/qfgl_ext.h @@ -45,7 +45,7 @@ # include #endif -#include "qtypes.h" +#include "QF/qtypes.h" // Define GLAPIENTRY to a useful value #ifndef GLAPIENTRY diff --git a/qw/include/r_dynamic.h b/qw/include/r_dynamic.h index b981d6688..3d8e6b575 100644 --- a/qw/include/r_dynamic.h +++ b/qw/include/r_dynamic.h @@ -29,7 +29,7 @@ #ifndef _R_DYNAMIC_H #define _R_DYNAMIC_H -#include "mathlib.h" +#include "QF/mathlib.h" struct entity_s; void R_RocketTrail (int type, struct entity_s *ent); diff --git a/qw/include/r_local.h b/qw/include/r_local.h index 9865dd2cf..017707c8f 100644 --- a/qw/include/r_local.h +++ b/qw/include/r_local.h @@ -29,8 +29,8 @@ #ifndef _R_LOCAL_H #define _R_LOCAL_H -#include "mathlib.h" -#include "cvar.h" +#include "QF/mathlib.h" +#include "QF/cvar.h" #include "vid.h" #include "client.h" #include "model.h" diff --git a/qw/include/r_shared.h b/qw/include/r_shared.h index e0d2286ea..24454aff7 100644 --- a/qw/include/r_shared.h +++ b/qw/include/r_shared.h @@ -31,8 +31,8 @@ #ifndef _R_SHARED_H #define _R_SHARED_H -#include "mathlib.h" -#include "cvar.h" +#include "QF/mathlib.h" +#include "QF/cvar.h" #include "model.h" #include "d_iface.h" diff --git a/qw/include/render.h b/qw/include/render.h index abf220d7e..a529597c2 100644 --- a/qw/include/render.h +++ b/qw/include/render.h @@ -29,8 +29,8 @@ #ifndef _RENDER_H #define _RENDER_H -#include "mathlib.h" -#include "cvar.h" +#include "QF/mathlib.h" +#include "QF/cvar.h" #include "vid.h" //#include "model.h" //now we know why (struct model_s *) is used here instead of model_t diff --git a/qw/include/screen.h b/qw/include/screen.h index 0dcae4e46..b1995da75 100644 --- a/qw/include/screen.h +++ b/qw/include/screen.h @@ -30,7 +30,7 @@ #ifndef _SCREEN_H #define _SCREEN_H -#include "cvar.h" +#include "QF/cvar.h" void SCR_Init_Cvars (void); void SCR_Init (void); diff --git a/qw/include/server.h b/qw/include/server.h index 97efb9fca..ac280bc78 100644 --- a/qw/include/server.h +++ b/qw/include/server.h @@ -30,16 +30,16 @@ #ifndef _SERVER_H #define _SERVER_H -#include "gcc_attr.h" +#include "QF/gcc_attr.h" #include "commdef.h" #include "net.h" -#include "cvar.h" +#include "QF/cvar.h" #include "protocol.h" #include "model.h" -#include "progs.h" -#include "sizebuf.h" -#include "info.h" -#include "quakeio.h" +#include "QF/progs.h" +#include "QF/sizebuf.h" +#include "QF/info.h" +#include "QF/quakeio.h" #define QW_SERVER diff --git a/qw/include/sound.h b/qw/include/sound.h index a148af562..228695383 100644 --- a/qw/include/sound.h +++ b/qw/include/sound.h @@ -30,9 +30,9 @@ #ifndef _SOUND_H #define _SOUND_H -#include "mathlib.h" -#include "cvar.h" -#include "zone.h" +#include "QF/mathlib.h" +#include "QF/cvar.h" +#include "QF/zone.h" // !!! if this is changed, it must be changed in asm_i386.h too !!! typedef struct diff --git a/qw/include/sv_progs.h b/qw/include/sv_progs.h index d62cd015d..f5349a1ec 100644 --- a/qw/include/sv_progs.h +++ b/qw/include/sv_progs.h @@ -32,7 +32,7 @@ #ifndef __sv_progs_h #define __sv_progs_h -#include "progs.h" +#include "QF/progs.h" typedef struct { int *self; diff --git a/qw/include/teamplay.h b/qw/include/teamplay.h index 816e2ae9d..64709b00f 100644 --- a/qw/include/teamplay.h +++ b/qw/include/teamplay.h @@ -29,7 +29,7 @@ #ifndef __teamplay_h #define __teamplay_h -#include "cvar.h" +#include "QF/cvar.h" extern cvar_t *cl_parsesay; extern cvar_t *cl_nofake; diff --git a/qw/include/tga.h b/qw/include/tga.h index 3e7f3775d..38866ca7b 100644 --- a/qw/include/tga.h +++ b/qw/include/tga.h @@ -29,8 +29,8 @@ #ifndef __tga_h #define __tga_h -#include "gcc_attr.h" -#include "qtypes.h" +#include "QF/gcc_attr.h" +#include "QF/qtypes.h" #ifndef __GNUC__ # if defined (__BORLANDC__) || defined (_MSC_VER) diff --git a/qw/include/vid.h b/qw/include/vid.h index 1d8574614..2d40d8404 100644 --- a/qw/include/vid.h +++ b/qw/include/vid.h @@ -29,7 +29,7 @@ #ifndef __vid_h_ #define __vid_h_ -#include "qtypes.h" +#include "QF/qtypes.h" #define VID_CBITS 6 #define VID_GRADES (1 << VID_CBITS) diff --git a/qw/include/view.h b/qw/include/view.h index 2f7833dbc..0987afcab 100644 --- a/qw/include/view.h +++ b/qw/include/view.h @@ -30,8 +30,8 @@ #ifndef __view_h_ #define __view_h_ -#include "mathlib.h" -#include "cvar.h" +#include "QF/mathlib.h" +#include "QF/cvar.h" extern cvar_t *brightness; extern cvar_t *contrast; diff --git a/qw/include/wad.h b/qw/include/wad.h index d166e4020..72a26dd51 100644 --- a/qw/include/wad.h +++ b/qw/include/wad.h @@ -30,7 +30,7 @@ #ifndef _WAD_H #define _WAD_H -#include "qtypes.h" +#include "QF/qtypes.h" //=============== // TYPES diff --git a/qw/include/world.h b/qw/include/world.h index 4f0be4113..cdd9ce710 100644 --- a/qw/include/world.h +++ b/qw/include/world.h @@ -30,9 +30,9 @@ #ifndef _WORLD_H #define _WORLD_H -#include "mathlib.h" +#include "QF/mathlib.h" #include "model.h" -#include "progs.h" +#include "QF/progs.h" typedef struct { diff --git a/qw/source/Makefile.am b/qw/source/Makefile.am index 60eccf574..e996d0946 100644 --- a/qw/source/Makefile.am +++ b/qw/source/Makefile.am @@ -83,7 +83,7 @@ endif server_SOURCES= sv_ccmds.c sv_cvar.c \ sv_ents.c sv_init.c sv_main.c sv_misc.c sv_model.c \ sv_move.c sv_nchan.c sv_phys.c sv_pr_cmds.c sv_progs.c sv_send.c \ - sv_user.c ver_check.c world.c $(world_ASM) + sv_user.c world.c $(world_ASM) qw_server_SOURCES= $(common_SOURCES) $(server_SOURCES) qw_server_LDADD= -L. -L../../libs -lqfnet -lqfsys_sv -lqfgamecode -lqfutil $(NET_LIBS) $(Z_LIBS) $(DL_LIBS) diff --git a/qw/source/cd_linux.c b/qw/source/cd_linux.c index 64274013e..cf6be4202 100644 --- a/qw/source/cd_linux.c +++ b/qw/source/cd_linux.c @@ -52,10 +52,10 @@ #include #include "cdaudio.h" -#include "cmd.h" -#include "console.h" -#include "cvar.h" -#include "qargs.h" +#include "QF/cmd.h" +#include "QF/console.h" +#include "QF/cvar.h" +#include "QF/qargs.h" #include "sound.h" static qboolean cdValid = false; diff --git a/qw/source/cl_cam.c b/qw/source/cl_cam.c index 6a66f8485..ac7635bc6 100644 --- a/qw/source/cl_cam.c +++ b/qw/source/cl_cam.c @@ -46,8 +46,8 @@ #include "cl_cam.h" #include "client.h" #include "commdef.h" -#include "console.h" -#include "msg.h" +#include "QF/console.h" +#include "QF/msg.h" #include "pmove.h" #include "sbar.h" diff --git a/qw/source/cl_cmd.c b/qw/source/cl_cmd.c index 46bcbd8bf..3b0518df4 100644 --- a/qw/source/cl_cmd.c +++ b/qw/source/cl_cmd.c @@ -37,9 +37,9 @@ #endif #include "client.h" -#include "console.h" -#include "cmd.h" -#include "msg.h" +#include "QF/console.h" +#include "QF/cmd.h" +#include "QF/msg.h" #include "teamplay.h" /* diff --git a/qw/source/cl_cvar.c b/qw/source/cl_cvar.c index 4b354682a..b299e0dd3 100644 --- a/qw/source/cl_cvar.c +++ b/qw/source/cl_cvar.c @@ -31,9 +31,9 @@ #endif #include "client.h" -#include "cvar.h" -#include "msg.h" -#include "va.h" +#include "QF/cvar.h" +#include "QF/msg.h" +#include "QF/va.h" void Cvar_Info (cvar_t *var) diff --git a/qw/source/cl_demo.c b/qw/source/cl_demo.c index 030b35713..b9d39cb78 100644 --- a/qw/source/cl_demo.c +++ b/qw/source/cl_demo.c @@ -36,16 +36,16 @@ # include #endif -#include "console.h" +#include "QF/console.h" #include "cl_main.h" #include "client.h" -#include "cmd.h" +#include "QF/cmd.h" #include "host.h" -#include "msg.h" +#include "QF/msg.h" #include "pmove.h" -#include "qendian.h" -#include "sys.h" -#include "va.h" +#include "QF/qendian.h" +#include "QF/sys.h" +#include "QF/va.h" void CL_FinishTimeDemo (void); diff --git a/qw/source/cl_ents.c b/qw/source/cl_ents.c index a3205171d..e56af06e9 100644 --- a/qw/source/cl_ents.c +++ b/qw/source/cl_ents.c @@ -41,10 +41,10 @@ #include "cl_main.h" #include "cl_pred.h" #include "cl_tent.h" -#include "console.h" +#include "QF/console.h" #include "d_iface.h" #include "host.h" -#include "msg.h" +#include "QF/msg.h" #include "msg_ucmd.h" #include "pmove.h" #include "r_dynamic.h" diff --git a/qw/source/cl_input.c b/qw/source/cl_input.c index 0aac75a01..c2190c817 100644 --- a/qw/source/cl_input.c +++ b/qw/source/cl_input.c @@ -36,18 +36,18 @@ # include #endif -#include "checksum.h" +#include "QF/checksum.h" #include "cl_cam.h" #include "cl_demo.h" #include "cl_input.h" #include "cl_parse.h" #include "client.h" -#include "cmd.h" -#include "console.h" +#include "QF/cmd.h" +#include "QF/console.h" #include "host.h" #include "input.h" -#include "keys.h" -#include "msg.h" +#include "QF/keys.h" +#include "QF/msg.h" #include "msg_ucmd.h" #include "teamplay.h" #include "view.h" diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c index c37ecafe7..7bb74a248 100644 --- a/qw/source/cl_main.c +++ b/qw/source/cl_main.c @@ -71,29 +71,29 @@ #include "cl_slist.h" #include "cl_tent.h" #include "client.h" -#include "cmd.h" -#include "console.h" -#include "cvar.h" +#include "QF/cmd.h" +#include "QF/console.h" +#include "QF/cvar.h" #include "draw.h" #include "host.h" #include "input.h" -#include "keys.h" +#include "QF/keys.h" #include "model.h" -#include "msg.h" +#include "QF/msg.h" #include "net.h" #include "pmove.h" -#include "qendian.h" -#include "quakefs.h" -#include "qargs.h" +#include "QF/qendian.h" +#include "QF/quakefs.h" +#include "QF/qargs.h" #include "sbar.h" #include "screen.h" #include "skin.h" #include "sound.h" -#include "sys.h" +#include "QF/sys.h" #include "teamplay.h" #include "vid.h" #include "view.h" -#include "va.h" +#include "QF/va.h" void CL_RemoveQFInfoKeys (); diff --git a/qw/source/cl_misc.c b/qw/source/cl_misc.c index fbbb1e170..67a598d9d 100644 --- a/qw/source/cl_misc.c +++ b/qw/source/cl_misc.c @@ -33,7 +33,7 @@ #include #include "host.h" -#include "sys.h" +#include "QF/sys.h" qboolean ServerPaused (void) diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c index 7797a1b68..9c52b4a0a 100644 --- a/qw/source/cl_parse.c +++ b/qw/source/cl_parse.c @@ -51,10 +51,10 @@ #include "cl_parse.h" #include "cl_tent.h" #include "client.h" -#include "cmd.h" -#include "console.h" +#include "QF/cmd.h" +#include "QF/console.h" #include "host.h" -#include "msg.h" +#include "QF/msg.h" #include "pmove.h" #include "protocol.h" #include "screen.h" @@ -62,7 +62,7 @@ #include "skin.h" #include "sound.h" #include "teamplay.h" -#include "va.h" +#include "QF/va.h" #include "view.h" extern cvar_t *gl_dlight_polyblend; diff --git a/qw/source/cl_pred.c b/qw/source/cl_pred.c index b3c3a5d89..922d49d09 100644 --- a/qw/source/cl_pred.c +++ b/qw/source/cl_pred.c @@ -36,8 +36,8 @@ #include "cl_ents.h" #include "client.h" #include "commdef.h" -#include "console.h" -#include "cvar.h" +#include "QF/console.h" +#include "QF/cvar.h" #include "pmove.h" cvar_t *cl_nopred; diff --git a/qw/source/cl_slist.c b/qw/source/cl_slist.c index ef8ef5a62..8ef4ae2e8 100644 --- a/qw/source/cl_slist.c +++ b/qw/source/cl_slist.c @@ -48,9 +48,9 @@ #include "bothdefs.h" #include "cl_slist.h" #include "commdef.h" -#include "console.h" -#include "quakefs.h" -#include "va.h" +#include "QF/console.h" +#include "QF/quakefs.h" +#include "QF/va.h" server_entry_t *slist; diff --git a/qw/source/cl_sys_unix.c b/qw/source/cl_sys_unix.c index 42043cd9c..d286b4eaa 100644 --- a/qw/source/cl_sys_unix.c +++ b/qw/source/cl_sys_unix.c @@ -44,10 +44,10 @@ #include #include -#include "cvar.h" +#include "QF/cvar.h" #include "host.h" -#include "qargs.h" -#include "sys.h" +#include "QF/qargs.h" +#include "QF/sys.h" int noconinput = 0; qboolean is_server = false; diff --git a/qw/source/cl_tent.c b/qw/source/cl_tent.c index d1594ffa5..7392283d8 100644 --- a/qw/source/cl_tent.c +++ b/qw/source/cl_tent.c @@ -43,10 +43,10 @@ #include "cl_main.h" #include "cl_tent.h" #include "client.h" -#include "console.h" +#include "QF/console.h" #include "host.h" #include "model.h" -#include "msg.h" +#include "QF/msg.h" #include "r_dynamic.h" #include "sound.h" diff --git a/qw/source/com.c b/qw/source/com.c index f6a02b068..b5e9931a9 100644 --- a/qw/source/com.c +++ b/qw/source/com.c @@ -32,12 +32,12 @@ #include -#include "cmd.h" -#include "console.h" -#include "cvar.h" -#include "qendian.h" -#include "quakefs.h" -#include "sys.h" +#include "QF/cmd.h" +#include "QF/console.h" +#include "QF/cvar.h" +#include "QF/qendian.h" +#include "QF/quakefs.h" +#include "QF/sys.h" cvar_t *registered; diff --git a/qw/source/console.c b/qw/source/console.c index 5f1e54ebc..e382cc88e 100644 --- a/qw/source/console.c +++ b/qw/source/console.c @@ -39,16 +39,16 @@ #include #include "client.h" -#include "cmd.h" +#include "QF/cmd.h" #include "commdef.h" -#include "console.h" +#include "QF/console.h" #include "draw.h" #include "input.h" -#include "keys.h" -#include "qargs.h" +#include "QF/keys.h" +#include "QF/qargs.h" #include "screen.h" -#include "sys.h" -#include "va.h" +#include "QF/sys.h" +#include "QF/va.h" int con_ormask; console_t con_main; diff --git a/qw/source/context_x11.c b/qw/source/context_x11.c index 0e69d3295..6a33eb7d7 100644 --- a/qw/source/context_x11.c +++ b/qw/source/context_x11.c @@ -61,15 +61,15 @@ #endif #include "commdef.h" -#include "console.h" +#include "QF/console.h" #include "context_x11.h" -#include "cvar.h" +#include "QF/cvar.h" #include "dga_check.h" #include "input.h" -#include "qargs.h" -#include "qtypes.h" -#include "sys.h" -#include "va.h" +#include "QF/qargs.h" +#include "QF/qtypes.h" +#include "QF/sys.h" +#include "QF/va.h" #include "vid.h" static void (*event_handlers[LASTEvent]) (XEvent *); diff --git a/qw/source/d_modech.c b/qw/source/d_modech.c index f2789d46c..11569dac9 100644 --- a/qw/source/d_modech.c +++ b/qw/source/d_modech.c @@ -31,7 +31,7 @@ #endif #include "d_local.h" -#include "sys.h" +#include "QF/sys.h" int d_vrectx, d_vrecty, d_vrectright_particle, d_vrectbottom_particle; diff --git a/qw/source/d_surf.c b/qw/source/d_surf.c index b288f51b6..f5a7d74a8 100644 --- a/qw/source/d_surf.c +++ b/qw/source/d_surf.c @@ -33,9 +33,9 @@ #include #include "d_local.h" -#include "qargs.h" +#include "QF/qargs.h" #include "r_local.h" -#include "sys.h" +#include "QF/sys.h" float surfscale; qboolean r_cache_thrash; // set if surface cache is thrashing diff --git a/qw/source/dga_check.c b/qw/source/dga_check.c index 732b9e306..207b4190c 100644 --- a/qw/source/dga_check.c +++ b/qw/source/dga_check.c @@ -52,7 +52,7 @@ # include #endif -#include "console.h" +#include "QF/console.h" #include "dga_check.h" diff --git a/qw/source/draw.c b/qw/source/draw.c index 8fee3c1a7..0f08f9cca 100644 --- a/qw/source/draw.c +++ b/qw/source/draw.c @@ -37,12 +37,12 @@ #endif #include "client.h" -#include "console.h" +#include "QF/console.h" #include "d_iface.h" #include "draw.h" -#include "quakefs.h" +#include "QF/quakefs.h" #include "sound.h" -#include "sys.h" +#include "QF/sys.h" typedef struct { vrect_t rect; diff --git a/qw/source/gl_draw.c b/qw/source/gl_draw.c index 26e24004c..90ae7ed71 100644 --- a/qw/source/gl_draw.c +++ b/qw/source/gl_draw.c @@ -38,13 +38,13 @@ #include -#include "cmd.h" -#include "console.h" +#include "QF/cmd.h" +#include "QF/console.h" #include "draw.h" #include "glquake.h" #include "sbar.h" #include "screen.h" -#include "sys.h" +#include "QF/sys.h" extern byte *host_basepal; diff --git a/qw/source/gl_dyn_fires.c b/qw/source/gl_dyn_fires.c index 21ca73784..7219e7053 100644 --- a/qw/source/gl_dyn_fires.c +++ b/qw/source/gl_dyn_fires.c @@ -39,8 +39,8 @@ #include #include "cl_main.h" -#include "cmd.h" -#include "console.h" +#include "QF/cmd.h" +#include "QF/console.h" #include "glquake.h" #define MAX_FIRES 128 // rocket flames diff --git a/qw/source/gl_dyn_part.c b/qw/source/gl_dyn_part.c index cd1035400..4789cf199 100644 --- a/qw/source/gl_dyn_part.c +++ b/qw/source/gl_dyn_part.c @@ -38,13 +38,13 @@ #include -#include "cmd.h" -#include "console.h" +#include "QF/cmd.h" +#include "QF/console.h" #include "glquake.h" #include "host.h" #include "r_dynamic.h" -#include "qargs.h" -#include "sys.h" +#include "QF/qargs.h" +#include "QF/sys.h" typedef enum { pt_static, pt_grav, pt_blob, pt_blob2, diff --git a/qw/source/gl_mesh.c b/qw/source/gl_mesh.c index f1046917c..8dca368af 100644 --- a/qw/source/gl_mesh.c +++ b/qw/source/gl_mesh.c @@ -38,10 +38,10 @@ #include -#include "console.h" -#include "mdfour.h" +#include "QF/console.h" +#include "QF/mdfour.h" #include "model.h" -#include "quakefs.h" +#include "QF/quakefs.h" /* ALIAS MODEL DISPLAY LIST GENERATION diff --git a/qw/source/gl_model_alias.c b/qw/source/gl_model_alias.c index ed2884a2d..56573077b 100644 --- a/qw/source/gl_model_alias.c +++ b/qw/source/gl_model_alias.c @@ -39,10 +39,10 @@ # include #endif -#include "console.h" +#include "QF/console.h" #include "glquake.h" #include "model.h" -#include "qendian.h" +#include "QF/qendian.h" #include "server.h" #include "skin.h" diff --git a/qw/source/gl_model_brush.c b/qw/source/gl_model_brush.c index 7900c1c84..73a4593d4 100644 --- a/qw/source/gl_model_brush.c +++ b/qw/source/gl_model_brush.c @@ -39,11 +39,11 @@ # include #endif -#include "console.h" +#include "QF/console.h" #include "glquake.h" #include "model.h" -#include "qendian.h" -#include "quakefs.h" +#include "QF/qendian.h" +#include "QF/quakefs.h" int Mod_Fullbright (byte * skin, int width, int height, char *name); diff --git a/qw/source/gl_model_fullbright.c b/qw/source/gl_model_fullbright.c index eb8a2b04d..643deeaf6 100644 --- a/qw/source/gl_model_fullbright.c +++ b/qw/source/gl_model_fullbright.c @@ -33,12 +33,12 @@ # include "config.h" #endif -#include "checksum.h" -#include "console.h" +#include "QF/checksum.h" +#include "QF/console.h" #include "glquake.h" -#include "qendian.h" +#include "QF/qendian.h" #include "r_local.h" -#include "sys.h" +#include "QF/sys.h" int Mod_CalcFullbright (byte *in, byte *out, int pixels) diff --git a/qw/source/gl_model_sprite.c b/qw/source/gl_model_sprite.c index 24b9e7fb2..5517dde6c 100644 --- a/qw/source/gl_model_sprite.c +++ b/qw/source/gl_model_sprite.c @@ -41,7 +41,7 @@ #include "glquake.h" #include "model.h" -#include "qendian.h" +#include "QF/qendian.h" extern model_t *loadmodel; extern char loadname[]; diff --git a/qw/source/gl_ngraph.c b/qw/source/gl_ngraph.c index d03c59426..785e4b8b3 100644 --- a/qw/source/gl_ngraph.c +++ b/qw/source/gl_ngraph.c @@ -39,7 +39,7 @@ #include #include "cl_parse.h" -#include "cvar.h" +#include "QF/cvar.h" #include "draw.h" #include "glquake.h" #include "sbar.h" diff --git a/qw/source/gl_rmain.c b/qw/source/gl_rmain.c index ff072cd03..d1e7d39f0 100644 --- a/qw/source/gl_rmain.c +++ b/qw/source/gl_rmain.c @@ -45,15 +45,15 @@ #include "cl_main.h" #include "cl_parse.h" //FIXME CL_NewTranslation #include "commdef.h" -#include "console.h" +#include "QF/console.h" #include "locs.h" #include "glquake.h" -#include "mathlib.h" -#include "qargs.h" +#include "QF/mathlib.h" +#include "QF/qargs.h" #include "r_dynamic.h" #include "skin.h" #include "sound.h" -#include "sys.h" +#include "QF/sys.h" #include "view.h" entity_t r_worldentity; diff --git a/qw/source/gl_rmisc.c b/qw/source/gl_rmisc.c index 766a08760..cf37f0411 100644 --- a/qw/source/gl_rmisc.c +++ b/qw/source/gl_rmisc.c @@ -38,13 +38,13 @@ #include -#include "cmd.h" -#include "console.h" -#include "cvar.h" +#include "QF/cmd.h" +#include "QF/console.h" +#include "QF/cvar.h" #include "glquake.h" #include "r_dynamic.h" #include "skin.h" -#include "sys.h" +#include "QF/sys.h" #include "vid.h" qboolean VID_Is8bit (void); diff --git a/qw/source/gl_rsurf.c b/qw/source/gl_rsurf.c index 7c7f09686..630c7f9fd 100644 --- a/qw/source/gl_rsurf.c +++ b/qw/source/gl_rsurf.c @@ -41,7 +41,7 @@ #include #include "glquake.h" -#include "sys.h" +#include "QF/sys.h" qboolean r_cache_thrash; diff --git a/qw/source/gl_screen.c b/qw/source/gl_screen.c index 8eb829fdd..7fed79d76 100644 --- a/qw/source/gl_screen.c +++ b/qw/source/gl_screen.c @@ -39,16 +39,16 @@ #include #include "cl_parse.h" -#include "cmd.h" -#include "console.h" +#include "QF/cmd.h" +#include "QF/console.h" #include "draw.h" #include "glquake.h" #include "host.h" -#include "keys.h" +#include "QF/keys.h" #include "pcx.h" #include "sbar.h" #include "skin.h" -#include "sys.h" +#include "QF/sys.h" #include "tga.h" #include "view.h" diff --git a/qw/source/gl_skin.c b/qw/source/gl_skin.c index 67bc90d87..e89c2f22c 100644 --- a/qw/source/gl_skin.c +++ b/qw/source/gl_skin.c @@ -34,7 +34,7 @@ #include "host.h" #include "protocol.h" #include "skin.h" -#include "sys.h" +#include "QF/sys.h" #include "texture.h" byte player_8bit_texels[320 * 200]; diff --git a/qw/source/gl_sky.c b/qw/source/gl_sky.c index 88a7b7ab5..119f1df52 100644 --- a/qw/source/gl_sky.c +++ b/qw/source/gl_sky.c @@ -36,7 +36,7 @@ # include #endif -#include "console.h" +#include "QF/console.h" #include "glquake.h" #include "tga.h" #include "view.h" diff --git a/qw/source/gl_sky_clip.c b/qw/source/gl_sky_clip.c index e34919f62..673839122 100644 --- a/qw/source/gl_sky_clip.c +++ b/qw/source/gl_sky_clip.c @@ -38,9 +38,9 @@ #include -#include "console.h" +#include "QF/console.h" #include "glquake.h" -#include "sys.h" +#include "QF/sys.h" #include "view.h" extern qboolean skyloaded; diff --git a/qw/source/gl_textures.c b/qw/source/gl_textures.c index 71b22e3a5..8808f308e 100644 --- a/qw/source/gl_textures.c +++ b/qw/source/gl_textures.c @@ -39,14 +39,14 @@ #include -#include "cmd.h" -#include "console.h" -#include "crc.h" +#include "QF/cmd.h" +#include "QF/console.h" +#include "QF/crc.h" #include "draw.h" #include "glquake.h" #include "sbar.h" #include "screen.h" -#include "sys.h" +#include "QF/sys.h" extern unsigned char d_15to8table[65536]; extern cvar_t *gl_picmip; diff --git a/qw/source/gl_warp.c b/qw/source/gl_warp.c index 81e924e2f..5aa535194 100644 --- a/qw/source/gl_warp.c +++ b/qw/source/gl_warp.c @@ -30,9 +30,9 @@ # include "config.h" #endif -#include "cvar.h" +#include "QF/cvar.h" #include "glquake.h" -#include "sys.h" +#include "QF/sys.h" extern double realtime; extern model_t *loadmodel; diff --git a/qw/source/in_sdl.c b/qw/source/in_sdl.c index 7561a50f0..ee38723d2 100644 --- a/qw/source/in_sdl.c +++ b/qw/source/in_sdl.c @@ -34,16 +34,16 @@ #include "client.h" #include "cl_input.h" #include "cl_main.h" -#include "console.h" -#include "cvar.h" +#include "QF/console.h" +#include "QF/cvar.h" #include "draw.h" #include "host.h" #include "input.h" #include "joystick.h" -#include "keys.h" -#include "sys.h" -#include "qargs.h" -#include "qendian.h" +#include "QF/keys.h" +#include "QF/sys.h" +#include "QF/qargs.h" +#include "QF/qendian.h" #include "vid.h" #include "view.h" diff --git a/qw/source/in_svgalib.c b/qw/source/in_svgalib.c index 47b77ca8a..dbccc8e73 100644 --- a/qw/source/in_svgalib.c +++ b/qw/source/in_svgalib.c @@ -44,15 +44,15 @@ #include "cl_input.h" #include "client.h" -#include "cmd.h" -#include "console.h" -#include "cvar.h" +#include "QF/cmd.h" +#include "QF/console.h" +#include "QF/cvar.h" #include "host.h" #include "input.h" #include "joystick.h" -#include "keys.h" -#include "qargs.h" -#include "sys.h" +#include "QF/keys.h" +#include "QF/qargs.h" +#include "QF/sys.h" #include "view.h" static int UseKeyboard = 1; diff --git a/qw/source/in_x11.c b/qw/source/in_x11.c index b526081e8..16e05bd8e 100644 --- a/qw/source/in_x11.c +++ b/qw/source/in_x11.c @@ -57,17 +57,17 @@ #include "cl_input.h" #include "client.h" -#include "console.h" +#include "QF/console.h" #include "context_x11.h" -#include "cmd.h" -#include "cvar.h" +#include "QF/cmd.h" +#include "QF/cvar.h" #include "dga_check.h" #include "host.h" #include "input.h" #include "joystick.h" -#include "keys.h" -#include "qargs.h" -#include "sys.h" +#include "QF/keys.h" +#include "QF/qargs.h" +#include "QF/sys.h" #include "view.h" cvar_t *_windowed_mouse; diff --git a/qw/source/joy_linux.c b/qw/source/joy_linux.c index 300c5289d..563e0e3d2 100644 --- a/qw/source/joy_linux.c +++ b/qw/source/joy_linux.c @@ -35,10 +35,10 @@ #include #include -#include "console.h" +#include "QF/console.h" #include "client.h" -#include "cvar.h" -#include "keys.h" +#include "QF/cvar.h" +#include "QF/keys.h" #include "protocol.h" #include "view.h" diff --git a/qw/source/keys.c b/qw/source/keys.c index ebcf76bd8..ba83753f1 100644 --- a/qw/source/keys.c +++ b/qw/source/keys.c @@ -43,12 +43,12 @@ #include #include "client.h" -#include "cmd.h" -#include "console.h" -#include "cvar.h" -#include "keys.h" +#include "QF/cmd.h" +#include "QF/console.h" +#include "QF/cvar.h" +#include "QF/keys.h" #include "screen.h" -#include "sys.h" +#include "QF/sys.h" /* diff --git a/qw/source/locs.c b/qw/source/locs.c index 62446aabc..7df145e50 100644 --- a/qw/source/locs.c +++ b/qw/source/locs.c @@ -39,11 +39,11 @@ #include #include "client.h" -#include "console.h" +#include "QF/console.h" #include "locs.h" -#include "quakefs.h" -#include "qtypes.h" -#include "sys.h" +#include "QF/quakefs.h" +#include "QF/qtypes.h" +#include "QF/sys.h" #define LOCATION_BLOCK 128 // 128 locations per block. diff --git a/qw/source/model.c b/qw/source/model.c index 2a7abe357..1cb54d324 100644 --- a/qw/source/model.c +++ b/qw/source/model.c @@ -39,10 +39,10 @@ # include #endif -#include "cvar.h" +#include "QF/cvar.h" #include "model.h" -#include "qendian.h" -#include "quakefs.h" +#include "QF/qendian.h" +#include "QF/quakefs.h" #include "server.h" void Mod_LoadAliasModel (model_t *mod, void *buf); diff --git a/qw/source/model_alias.c b/qw/source/model_alias.c index 2ae18aba7..6d9e3c61a 100644 --- a/qw/source/model_alias.c +++ b/qw/source/model_alias.c @@ -41,12 +41,12 @@ #include "cl_main.h" #include "client.h" -#include "crc.h" -#include "info.h" +#include "QF/crc.h" +#include "QF/info.h" #include "model.h" -#include "msg.h" -#include "qendian.h" -#include "quakefs.h" +#include "QF/msg.h" +#include "QF/qendian.h" +#include "QF/quakefs.h" #include "r_local.h" #include "server.h" diff --git a/qw/source/model_brush.c b/qw/source/model_brush.c index 4ef636329..525e88bf4 100644 --- a/qw/source/model_brush.c +++ b/qw/source/model_brush.c @@ -42,10 +42,10 @@ #include -#include "checksum.h" -#include "cvar.h" +#include "QF/checksum.h" +#include "QF/cvar.h" #include "model.h" -#include "qendian.h" +#include "QF/qendian.h" #include "server.h" extern model_t *loadmodel; diff --git a/qw/source/model_sprite.c b/qw/source/model_sprite.c index 938fdcb0c..232454827 100644 --- a/qw/source/model_sprite.c +++ b/qw/source/model_sprite.c @@ -35,7 +35,7 @@ #include "model.h" #include "server.h" -#include "qendian.h" +#include "QF/qendian.h" extern model_t *loadmodel; extern char loadname[]; diff --git a/qw/source/msg_ucmd.c b/qw/source/msg_ucmd.c index e55d651e1..a6c9b0d23 100644 --- a/qw/source/msg_ucmd.c +++ b/qw/source/msg_ucmd.c @@ -36,11 +36,11 @@ # include #endif -#include "msg.h" +#include "QF/msg.h" #include "net.h" #include "protocol.h" -#include "qendian.h" -#include "sys.h" +#include "QF/qendian.h" +#include "QF/sys.h" struct usercmd_s nullcmd; diff --git a/qw/source/net_chan.c b/qw/source/net_chan.c index 709f6fd46..99aee55f8 100644 --- a/qw/source/net_chan.c +++ b/qw/source/net_chan.c @@ -46,9 +46,9 @@ #include "client.h" #include "commdef.h" -#include "console.h" -#include "cvar.h" -#include "msg.h" +#include "QF/console.h" +#include "QF/cvar.h" +#include "QF/msg.h" #include "net.h" #define PACKET_HEADER 8 diff --git a/qw/source/net_udp.c b/qw/source/net_udp.c index ac28bb891..dc608586b 100644 --- a/qw/source/net_udp.c +++ b/qw/source/net_udp.c @@ -68,11 +68,11 @@ # include #endif -#include "console.h" -#include "msg.h" +#include "QF/console.h" +#include "QF/msg.h" #include "net.h" -#include "sys.h" -#include "qargs.h" +#include "QF/sys.h" +#include "QF/qargs.h" #ifdef _WIN32 # include diff --git a/qw/source/pcx.c b/qw/source/pcx.c index ecc877e1b..c2db301f8 100644 --- a/qw/source/pcx.c +++ b/qw/source/pcx.c @@ -37,14 +37,14 @@ #endif #include "cl_parse.h" -#include "console.h" +#include "QF/console.h" #include "host.h" #include "pcx.h" -#include "qendian.h" -#include "qtypes.h" -#include "quakefs.h" +#include "QF/qendian.h" +#include "QF/qtypes.h" +#include "QF/quakefs.h" #include "texture.h" -#include "zone.h" +#include "QF/zone.h" /* LoadPCX diff --git a/qw/source/pmove.c b/qw/source/pmove.c index 4eec02cc8..dcac2066f 100644 --- a/qw/source/pmove.c +++ b/qw/source/pmove.c @@ -33,10 +33,10 @@ #include #include "client.h" -#include "compat.h" -#include "cvar.h" +#include "QF/compat.h" +#include "QF/cvar.h" #include "pmove.h" -#include "qtypes.h" +#include "QF/qtypes.h" cvar_t *no_pogo_stick; movevars_t movevars; diff --git a/qw/source/pmovetst.c b/qw/source/pmovetst.c index 4e84c4ba7..4a7706e52 100644 --- a/qw/source/pmovetst.c +++ b/qw/source/pmovetst.c @@ -36,11 +36,11 @@ # include #endif -#include "console.h" +#include "QF/console.h" #include "model.h" #include "pmove.h" -#include "qtypes.h" -#include "sys.h" +#include "QF/qtypes.h" +#include "QF/sys.h" static hull_t box_hull; static dclipnode_t box_clipnodes[6]; diff --git a/qw/source/qfgl_ext.c b/qw/source/qfgl_ext.c index f4f5857c2..6ef7e6a34 100644 --- a/qw/source/qfgl_ext.c +++ b/qw/source/qfgl_ext.c @@ -65,7 +65,7 @@ #endif #include "qfgl_ext.h" -#include "qtypes.h" +#include "QF/qtypes.h" /* ParseExtensionList diff --git a/qw/source/quakefs.c b/qw/source/quakefs.c index fb83f2599..abe79cd0c 100644 --- a/qw/source/quakefs.c +++ b/qw/source/quakefs.c @@ -61,20 +61,20 @@ #include -#include "cmd.h" +#include "QF/cmd.h" #include "commdef.h" -#include "console.h" -#include "cvar.h" +#include "QF/console.h" +#include "QF/cvar.h" #include "draw.h" -#include "hash.h" -#include "info.h" -#include "qargs.h" -#include "qendian.h" -#include "qtypes.h" -#include "quakefs.h" +#include "QF/hash.h" +#include "QF/info.h" +#include "QF/qargs.h" +#include "QF/qendian.h" +#include "QF/qtypes.h" +#include "QF/quakefs.h" #include "server.h" -#include "sys.h" -#include "va.h" +#include "QF/sys.h" +#include "QF/va.h" #ifndef HAVE_FNMATCH_PROTO int fnmatch (const char *__pattern, const char *__string, int __flags); diff --git a/qw/source/quakeio.c b/qw/source/quakeio.c index 7249efedb..cc3733935 100644 --- a/qw/source/quakeio.c +++ b/qw/source/quakeio.c @@ -57,8 +57,8 @@ #include #include -#include "quakefs.h" -#include "quakeio.h" +#include "QF/quakefs.h" +#include "QF/quakeio.h" #ifdef WIN32 # ifndef __BORLANDC__ diff --git a/qw/source/r_alias.c b/qw/source/r_alias.c index 133272c87..91a23425a 100644 --- a/qw/source/r_alias.c +++ b/qw/source/r_alias.c @@ -30,11 +30,11 @@ # include "config.h" #endif -#include "console.h" +#include "QF/console.h" #include "d_ifacea.h" #include "r_local.h" #include "skin.h" -#include "sys.h" +#include "QF/sys.h" #include "texture.h" #define LIGHT_MIN 5 // lowest light value we'll allow, to diff --git a/qw/source/r_bsp.c b/qw/source/r_bsp.c index 6d19de137..2b3fc3dfd 100644 --- a/qw/source/r_bsp.c +++ b/qw/source/r_bsp.c @@ -32,9 +32,9 @@ #include -#include "console.h" +#include "QF/console.h" #include "r_local.h" -#include "sys.h" +#include "QF/sys.h" // // current entity info diff --git a/qw/source/r_efrag.c b/qw/source/r_efrag.c index 5b0dc7a8b..c6a4ab887 100644 --- a/qw/source/r_efrag.c +++ b/qw/source/r_efrag.c @@ -33,9 +33,9 @@ #include "bothdefs.h" #include "cl_main.h" #include "cl_tent.h" -#include "console.h" +#include "QF/console.h" #include "r_local.h" -#include "sys.h" +#include "QF/sys.h" mnode_t *r_pefragtopnode; diff --git a/qw/source/r_main.c b/qw/source/r_main.c index 82f4bedfa..78187d830 100644 --- a/qw/source/r_main.c +++ b/qw/source/r_main.c @@ -41,15 +41,15 @@ #include "bothdefs.h" #include "cl_cam.h" #include "cl_main.h" -#include "console.h" -#include "cmd.h" +#include "QF/console.h" +#include "QF/cmd.h" #include "locs.h" -#include "mathlib.h" +#include "QF/mathlib.h" #include "r_dynamic.h" #include "r_local.h" #include "screen.h" #include "sound.h" -#include "sys.h" +#include "QF/sys.h" #include "view.h" //define PASSAGES diff --git a/qw/source/r_misc.c b/qw/source/r_misc.c index 6030091a0..d4dc66a83 100644 --- a/qw/source/r_misc.c +++ b/qw/source/r_misc.c @@ -30,14 +30,14 @@ # include "config.h" #endif -#include "console.h" -#include "cmd.h" +#include "QF/console.h" +#include "QF/cmd.h" #include "cl_parse.h" #include "draw.h" #include "host.h" #include "r_local.h" #include "sbar.h" -#include "sys.h" +#include "QF/sys.h" qboolean allowskybox; // whether or not to allow skyboxes diff --git a/qw/source/r_part.c b/qw/source/r_part.c index 3795b8b67..712d731c4 100644 --- a/qw/source/r_part.c +++ b/qw/source/r_part.c @@ -32,10 +32,10 @@ #include -#include "console.h" +#include "QF/console.h" #include "host.h" -#include "qargs.h" -#include "quakefs.h" +#include "QF/qargs.h" +#include "QF/quakefs.h" #include "r_dynamic.h" #include "r_local.h" diff --git a/qw/source/r_sprite.c b/qw/source/r_sprite.c index c07dcabd0..e094cd888 100644 --- a/qw/source/r_sprite.c +++ b/qw/source/r_sprite.c @@ -38,9 +38,9 @@ #include -#include "console.h" +#include "QF/console.h" #include "r_local.h" -#include "sys.h" +#include "QF/sys.h" static int clip_current; static vec5_t clip_verts[2][MAXWORKINGVERTS]; diff --git a/qw/source/r_surf.c b/qw/source/r_surf.c index 7dcbf82b6..1410926d6 100644 --- a/qw/source/r_surf.c +++ b/qw/source/r_surf.c @@ -31,7 +31,7 @@ #endif #include "r_local.h" -#include "sys.h" +#include "QF/sys.h" drawsurf_t r_drawsurf; diff --git a/qw/source/r_view.c b/qw/source/r_view.c index 6f953a189..523ca5676 100644 --- a/qw/source/r_view.c +++ b/qw/source/r_view.c @@ -35,10 +35,10 @@ #include "bothdefs.h" #include "client.h" -#include "cmd.h" -#include "cvar.h" +#include "QF/cmd.h" +#include "QF/cvar.h" #include "host.h" -#include "msg.h" +#include "QF/msg.h" #include "pmove.h" #include "screen.h" #include "vid.h" diff --git a/qw/source/sbar.c b/qw/source/sbar.c index 6e0200ac8..9d07a105b 100644 --- a/qw/source/sbar.c +++ b/qw/source/sbar.c @@ -41,13 +41,13 @@ #include "bothdefs.h" #include "cl_cam.h" #include "client.h" -#include "cmd.h" +#include "QF/cmd.h" #include "commdef.h" #include "draw.h" -#include "msg.h" +#include "QF/msg.h" #include "sbar.h" #include "screen.h" -#include "va.h" +#include "QF/va.h" #include "vid.h" int sb_updates; // if >= vid.numpages, no update diff --git a/qw/source/screen.c b/qw/source/screen.c index 212d4e859..e560cd791 100644 --- a/qw/source/screen.c +++ b/qw/source/screen.c @@ -40,16 +40,16 @@ #include "cl_parse.h" #include "client.h" -#include "cmd.h" -#include "console.h" +#include "QF/cmd.h" +#include "QF/console.h" #include "d_iface.h" #include "draw.h" #include "host.h" -#include "keys.h" +#include "QF/keys.h" #include "pcx.h" #include "sbar.h" #include "skin.h" -#include "sys.h" +#include "QF/sys.h" #include "vid.h" #include "view.h" diff --git a/qw/source/skin.c b/qw/source/skin.c index b79726a3a..c5cf02fd4 100644 --- a/qw/source/skin.c +++ b/qw/source/skin.c @@ -38,17 +38,17 @@ #include "cl_parse.h" #include "client.h" -#include "console.h" -#include "cmd.h" +#include "QF/console.h" +#include "QF/cmd.h" #include "host.h" -#include "msg.h" +#include "QF/msg.h" #include "pcx.h" -#include "qendian.h" +#include "QF/qendian.h" #include "screen.h" #include "skin.h" -#include "sys.h" +#include "QF/sys.h" #include "texture.h" -#include "va.h" +#include "QF/va.h" cvar_t *baseskin; cvar_t *noskins; diff --git a/qw/source/snd_alsa_0_9.c b/qw/source/snd_alsa_0_9.c index b5e646f29..8f33c54e0 100644 --- a/qw/source/snd_alsa_0_9.c +++ b/qw/source/snd_alsa_0_9.c @@ -35,10 +35,10 @@ #include -#include "qtypes.h" +#include "QF/qtypes.h" #include "sound.h" -#include "qargs.h" -#include "console.h" +#include "QF/qargs.h" +#include "QF/console.h" static int snd_inited; diff --git a/qw/source/snd_dma.c b/qw/source/snd_dma.c index 267ec3464..8007df824 100644 --- a/qw/source/snd_dma.c +++ b/qw/source/snd_dma.c @@ -39,12 +39,12 @@ #include #include "client.h" -#include "cmd.h" -#include "console.h" +#include "QF/cmd.h" +#include "QF/console.h" #include "host.h" #include "model.h" -#include "qargs.h" -#include "sys.h" +#include "QF/qargs.h" +#include "QF/sys.h" #include "sound.h" #ifdef _WIN32 diff --git a/qw/source/snd_mem.c b/qw/source/snd_mem.c index 0b78c4099..03f70162b 100644 --- a/qw/source/snd_mem.c +++ b/qw/source/snd_mem.c @@ -36,11 +36,11 @@ # include #endif -#include "console.h" -#include "qendian.h" -#include "quakefs.h" +#include "QF/console.h" +#include "QF/qendian.h" +#include "QF/quakefs.h" #include "sound.h" -#include "sys.h" +#include "QF/sys.h" int cache_full_cycle; diff --git a/qw/source/snd_mix.c b/qw/source/snd_mix.c index 4ec1ff84f..010f2623e 100644 --- a/qw/source/snd_mix.c +++ b/qw/source/snd_mix.c @@ -36,7 +36,7 @@ # include #endif -#include "console.h" +#include "QF/console.h" #include "sound.h" #ifdef _WIN32 diff --git a/qw/source/sv_ccmds.c b/qw/source/sv_ccmds.c index 03fa87dda..c882f4374 100644 --- a/qw/source/sv_ccmds.c +++ b/qw/source/sv_ccmds.c @@ -39,15 +39,15 @@ #include #include "bothdefs.h" -#include "cmd.h" -#include "msg.h" -#include "qargs.h" -#include "qendian.h" -#include "quakefs.h" +#include "QF/cmd.h" +#include "QF/msg.h" +#include "QF/qargs.h" +#include "QF/qendian.h" +#include "QF/quakefs.h" #include "server.h" #include "sv_progs.h" -#include "sys.h" -#include "va.h" +#include "QF/sys.h" +#include "QF/va.h" qboolean sv_allow_cheats; diff --git a/qw/source/sv_cvar.c b/qw/source/sv_cvar.c index 67b1dd302..a76ff3bb9 100644 --- a/qw/source/sv_cvar.c +++ b/qw/source/sv_cvar.c @@ -30,7 +30,7 @@ # include "config.h" #endif -#include "cvar.h" +#include "QF/cvar.h" #include "server.h" void SV_SendServerInfoChange (char *key, char *value); diff --git a/qw/source/sv_ents.c b/qw/source/sv_ents.c index a9d61806d..e7418656a 100644 --- a/qw/source/sv_ents.c +++ b/qw/source/sv_ents.c @@ -36,11 +36,11 @@ # include #endif -#include "msg.h" +#include "QF/msg.h" #include "msg_ucmd.h" #include "server.h" #include "sv_progs.h" -#include "sys.h" +#include "QF/sys.h" /* The PVS must include a small area around the client to allow head diff --git a/qw/source/sv_init.c b/qw/source/sv_init.c index fb6c8d58e..e6a58aa4e 100644 --- a/qw/source/sv_init.c +++ b/qw/source/sv_init.c @@ -36,13 +36,13 @@ # include #endif -#include "crc.h" -#include "msg.h" -#include "quakefs.h" +#include "QF/crc.h" +#include "QF/msg.h" +#include "QF/quakefs.h" #include "server.h" #include "sv_progs.h" #include "world.h" -#include "va.h" +#include "QF/va.h" server_t sv; // local server diff --git a/qw/source/sv_main.c b/qw/source/sv_main.c index ed4157078..a79c1d6d0 100644 --- a/qw/source/sv_main.c +++ b/qw/source/sv_main.c @@ -41,19 +41,19 @@ #include "bothdefs.h" #include "buildnum.h" -#include "cmd.h" +#include "QF/cmd.h" #include "model.h" #include "net.h" -#include "msg.h" +#include "QF/msg.h" #include "pmove.h" -#include "qargs.h" -#include "quakefs.h" +#include "QF/qargs.h" +#include "QF/quakefs.h" #include "server.h" #include "sv_progs.h" -#include "sys.h" -#include "va.h" -#include "ver_check.h" -#include "zone.h" +#include "QF/sys.h" +#include "QF/va.h" +#include "QF/ver_check.h" +#include "QF/zone.h" quakeparms_t host_parms; qboolean host_initialized; // true if into command execution diff --git a/qw/source/sv_model.c b/qw/source/sv_model.c index ca7a33df1..ccfc141a1 100644 --- a/qw/source/sv_model.c +++ b/qw/source/sv_model.c @@ -31,7 +31,7 @@ # include "config.h" #endif -#include "cvar.h" +#include "QF/cvar.h" #include "model.h" const int mod_lightmap_bytes = 1; diff --git a/qw/source/sv_move.c b/qw/source/sv_move.c index f755a3b97..034208367 100644 --- a/qw/source/sv_move.c +++ b/qw/source/sv_move.c @@ -33,7 +33,7 @@ #include #include -#include "qtypes.h" +#include "QF/qtypes.h" #include "pmove.h" #include "server.h" #include "sv_pr_cmds.h" diff --git a/qw/source/sv_nchan.c b/qw/source/sv_nchan.c index 4266495ee..0c8961d14 100644 --- a/qw/source/sv_nchan.c +++ b/qw/source/sv_nchan.c @@ -36,7 +36,7 @@ # include #endif -#include "msg.h" +#include "QF/msg.h" #include "server.h" // check to see if client block will fit, if not, rotate buffers diff --git a/qw/source/sv_phys.c b/qw/source/sv_phys.c index f894df694..2263c5091 100644 --- a/qw/source/sv_phys.c +++ b/qw/source/sv_phys.c @@ -30,7 +30,7 @@ # include "config.h" #endif -#include "cvar.h" +#include "QF/cvar.h" #include "pmove.h" #include "server.h" #include "sv_progs.h" diff --git a/qw/source/sv_pr_cmds.c b/qw/source/sv_pr_cmds.c index dafd2cf5b..96318b5d9 100644 --- a/qw/source/sv_pr_cmds.c +++ b/qw/source/sv_pr_cmds.c @@ -33,13 +33,13 @@ # include #endif -#include "cmd.h" -#include "msg.h" +#include "QF/cmd.h" +#include "QF/msg.h" #include "server.h" #include "sv_pr_cmds.h" #include "sv_progs.h" #include "world.h" -#include "va.h" +#include "QF/va.h" #define RETURN_EDICT(p, e) ((p)->pr_globals[OFS_RETURN].int_var = EDICT_TO_PROG(p, e)) #define RETURN_STRING(p, s) ((p)->pr_globals[OFS_RETURN].int_var = PR_SetString((p), s)) diff --git a/qw/source/sv_progs.c b/qw/source/sv_progs.c index 797382dab..175529c72 100644 --- a/qw/source/sv_progs.c +++ b/qw/source/sv_progs.c @@ -37,7 +37,7 @@ #include "strings.h" #endif -#include "cmd.h" +#include "QF/cmd.h" #include "server.h" #include "progdefs.h" #include "sv_progs.h" diff --git a/qw/source/sv_send.c b/qw/source/sv_send.c index 337712944..bd72d20f6 100644 --- a/qw/source/sv_send.c +++ b/qw/source/sv_send.c @@ -38,10 +38,10 @@ #include #include "bothdefs.h" -#include "msg.h" +#include "QF/msg.h" #include "server.h" #include "sv_progs.h" -#include "sys.h" +#include "QF/sys.h" #define CHAN_AUTO 0 #define CHAN_WEAPON 1 diff --git a/qw/source/sv_sys_unix.c b/qw/source/sv_sys_unix.c index 94f48a740..1a7801ba3 100644 --- a/qw/source/sv_sys_unix.c +++ b/qw/source/sv_sys_unix.c @@ -45,10 +45,10 @@ #include #include -#include "cvar.h" -#include "qargs.h" +#include "QF/cvar.h" +#include "QF/qargs.h" #include "server.h" -#include "sys.h" +#include "QF/sys.h" #ifdef NeXT # include diff --git a/qw/source/sv_user.c b/qw/source/sv_user.c index 4399fdeb1..031eeef3f 100644 --- a/qw/source/sv_user.c +++ b/qw/source/sv_user.c @@ -42,17 +42,17 @@ #include #include "bothdefs.h" -#include "checksum.h" -#include "cmd.h" -#include "cvar.h" -#include "msg.h" +#include "QF/checksum.h" +#include "QF/cmd.h" +#include "QF/cvar.h" +#include "QF/msg.h" #include "msg_ucmd.h" #include "pmove.h" -#include "quakefs.h" +#include "QF/quakefs.h" #include "server.h" #include "sv_progs.h" -#include "sys.h" -#include "va.h" +#include "QF/sys.h" +#include "QF/va.h" #include "world.h" edict_t *sv_player; diff --git a/qw/source/sw_model_alias.c b/qw/source/sw_model_alias.c index ce533ae48..80f88cda4 100644 --- a/qw/source/sw_model_alias.c +++ b/qw/source/sw_model_alias.c @@ -40,12 +40,12 @@ #include #endif -#include "checksum.h" +#include "QF/checksum.h" #include "d_iface.h" #include "model.h" -#include "qendian.h" +#include "QF/qendian.h" #include "server.h" -#include "sys.h" +#include "QF/sys.h" extern char loadname[]; extern model_t *loadmodel; diff --git a/qw/source/sw_model_sprite.c b/qw/source/sw_model_sprite.c index 3737356c9..5671abf39 100644 --- a/qw/source/sw_model_sprite.c +++ b/qw/source/sw_model_sprite.c @@ -41,7 +41,7 @@ #include "d_iface.h" #include "model.h" -#include "qendian.h" +#include "QF/qendian.h" #include "server.h" extern model_t *loadmodel; diff --git a/qw/source/sw_skin.c b/qw/source/sw_skin.c index 474ee3d74..03c1635bb 100644 --- a/qw/source/sw_skin.c +++ b/qw/source/sw_skin.c @@ -40,7 +40,7 @@ #include "client.h" #include "host.h" #include "skin.h" -#include "sys.h" +#include "QF/sys.h" #include "vid.h" void diff --git a/qw/source/sys_unix.c b/qw/source/sys_unix.c index d88e8a96f..6a3dee3d0 100644 --- a/qw/source/sys_unix.c +++ b/qw/source/sys_unix.c @@ -44,11 +44,11 @@ #include #endif -#include "cvar.h" +#include "QF/cvar.h" #include "host.h" -#include "qargs.h" +#include "QF/qargs.h" #include "server.h" -#include "sys.h" +#include "QF/sys.h" cvar_t *sys_nostdout; diff --git a/qw/source/teamplay.c b/qw/source/teamplay.c index 9ab761021..a286a030a 100644 --- a/qw/source/teamplay.c +++ b/qw/source/teamplay.c @@ -39,12 +39,12 @@ #include #include "bothdefs.h" -#include "console.h" -#include "cmd.h" +#include "QF/console.h" +#include "QF/cmd.h" #include "client.h" #include "locs.h" #include "model.h" -#include "sys.h" +#include "QF/sys.h" #include "teamplay.h" extern cvar_t *skin; diff --git a/qw/source/tga.c b/qw/source/tga.c index 3115818a6..d807fa2b1 100644 --- a/qw/source/tga.c +++ b/qw/source/tga.c @@ -36,9 +36,9 @@ # include #endif -#include "qendian.h" -#include "quakefs.h" -#include "sys.h" +#include "QF/qendian.h" +#include "QF/quakefs.h" +#include "QF/sys.h" #include "tga.h" static int diff --git a/qw/source/vid.c b/qw/source/vid.c index c9bd3e2c4..e5db0dd2e 100644 --- a/qw/source/vid.c +++ b/qw/source/vid.c @@ -30,11 +30,11 @@ # include "config.h" #endif -#include "cvar.h" +#include "QF/cvar.h" #include "vid.h" -#include "va.h" -#include "qargs.h" -#include "sys.h" +#include "QF/va.h" +#include "QF/qargs.h" +#include "QF/sys.h" extern viddef_t vid; // global video state diff --git a/qw/source/vid_common_gl.c b/qw/source/vid_common_gl.c index 02ecf334d..8adac104d 100644 --- a/qw/source/vid_common_gl.c +++ b/qw/source/vid_common_gl.c @@ -44,12 +44,12 @@ #include -#include "console.h" +#include "QF/console.h" #include "glquake.h" #include "input.h" -#include "qargs.h" +#include "QF/qargs.h" #include "qfgl_ext.h" -#include "quakefs.h" +#include "QF/quakefs.h" #include "sbar.h" #define WARP_WIDTH 320 diff --git a/qw/source/vid_glx.c b/qw/source/vid_glx.c index 2e2526962..62fabbddf 100644 --- a/qw/source/vid_glx.c +++ b/qw/source/vid_glx.c @@ -46,16 +46,16 @@ # include #endif -#include "console.h" +#include "QF/console.h" #include "context_x11.h" #include "glquake.h" #include "host.h" #include "input.h" -#include "qargs.h" -#include "qendian.h" -#include "quakefs.h" +#include "QF/qargs.h" +#include "QF/qendian.h" +#include "QF/quakefs.h" #include "sbar.h" -#include "va.h" +#include "QF/va.h" #define WARP_WIDTH 320 #define WARP_HEIGHT 200 diff --git a/qw/source/vid_sdl.c b/qw/source/vid_sdl.c index 3f573b1a3..91d6970e4 100644 --- a/qw/source/vid_sdl.c +++ b/qw/source/vid_sdl.c @@ -38,13 +38,13 @@ #include -#include "console.h" -#include "cvar.h" +#include "QF/console.h" +#include "QF/cvar.h" #include "d_local.h" #include "host.h" -#include "qendian.h" -#include "sys.h" -#include "va.h" +#include "QF/qendian.h" +#include "QF/sys.h" +#include "QF/va.h" #include "vid.h" #ifdef WIN32 diff --git a/qw/source/vid_sgl.c b/qw/source/vid_sgl.c index 8864b511a..3f46444cf 100644 --- a/qw/source/vid_sgl.c +++ b/qw/source/vid_sgl.c @@ -41,14 +41,14 @@ #include -#include "console.h" +#include "QF/console.h" #include "glquake.h" #include "host.h" -#include "qargs.h" -#include "qendian.h" +#include "QF/qargs.h" +#include "QF/qendian.h" #include "sbar.h" -#include "sys.h" -#include "va.h" +#include "QF/sys.h" +#include "QF/va.h" #ifdef WIN32 /* FIXME: this is evil hack to get full DirectSound support with SDL */ diff --git a/qw/source/vid_svgalib.c b/qw/source/vid_svgalib.c index 4412e47d2..d2201f70b 100644 --- a/qw/source/vid_svgalib.c +++ b/qw/source/vid_svgalib.c @@ -46,15 +46,15 @@ #include #include -#include "cmd.h" -#include "console.h" -#include "cvar.h" +#include "QF/cmd.h" +#include "QF/console.h" +#include "QF/cvar.h" #include "d_local.h" #include "host.h" #include "input.h" -#include "qargs.h" -#include "qendian.h" -#include "sys.h" +#include "QF/qargs.h" +#include "QF/qendian.h" +#include "QF/sys.h" void VGA_UpdatePlanarScreen (void *srcbuffer); diff --git a/qw/source/vid_x11.c b/qw/source/vid_x11.c index aae4e64a2..40271182f 100644 --- a/qw/source/vid_x11.c +++ b/qw/source/vid_x11.c @@ -66,19 +66,19 @@ #endif #include "client.h" -#include "cmd.h" -#include "console.h" +#include "QF/cmd.h" +#include "QF/console.h" #include "context_x11.h" -#include "cvar.h" +#include "QF/cvar.h" #include "d_local.h" #include "dga_check.h" #include "draw.h" #include "host.h" -#include "qargs.h" -#include "qendian.h" +#include "QF/qargs.h" +#include "QF/qendian.h" #include "screen.h" -#include "sys.h" -#include "va.h" +#include "QF/sys.h" +#include "QF/va.h" extern viddef_t vid; // global video state unsigned short d_8to16table[256]; diff --git a/qw/source/wad.c b/qw/source/wad.c index 5df698183..e18634614 100644 --- a/qw/source/wad.c +++ b/qw/source/wad.c @@ -36,9 +36,9 @@ # include #endif -#include "sys.h" -#include "quakefs.h" -#include "qendian.h" +#include "QF/sys.h" +#include "QF/quakefs.h" +#include "QF/qendian.h" #include "wad.h" int wad_numlumps; diff --git a/qw/source/world.c b/qw/source/world.c index 781004ff4..fcc8d3a62 100644 --- a/qw/source/world.c +++ b/qw/source/world.c @@ -39,8 +39,8 @@ #include #include "commdef.h" -#include "console.h" -#include "crc.h" +#include "QF/console.h" +#include "QF/crc.h" #include "server.h" #include "sv_progs.h" #include "world.h" diff --git a/tools/qfcc/configure.in b/tools/qfcc/configure.in index 9745f1a68..88dee3c8c 100644 --- a/tools/qfcc/configure.in +++ b/tools/qfcc/configure.in @@ -47,6 +47,26 @@ dnl Checks for typedefs, structures, and compiler characteristics. dnl Checks for library functions. +AC_ARG_WITH(qf-headers, +[ --with-qf-headers=DIR use the QuakeForge headers found in DRI], +QF_HEADERS=$withval, QF_HEADERS=auto) +AC_ARG_WITH(qf-libs, +[ --with-qf-libs=DIR use the QuakeForge libs found in DRI], +QF_LIBS=$withval, QF_LIBS=auto) + +AC_MSG_CHECKING(for QF headers location) +if test "x$QF_HEADERS" = xauto; then + if test -r ../../include/qtypes.h; then + fi +fi +AC_MSG_RESULT($QF_HEADERS) + +AC_MSG_CHECKING(for QF libs location) +if test "x$QF_LIBS" = xauto; then + true +fi +AC_MSG_RESULT($QF_LIBS) + AC_OUTPUT( include/Makefile source/Makefile