fix up a mis-understanding about api headers

*taniwha larts himself for not explaining things to Despair
2025-01-18 06:51:47 +00:00 · 2001-04-10 21:45:42 +00:00 · 2001-04-10 21:45:42 +00:00 · 8e2d89c4c2
commit 8e2d89c4c2
parent 082c5ccae4
53 changed files with 62 additions and 70 deletions
--- a/include/Makefile.am
+++ b/include/Makefile.am
@ -1,6 +1,4 @@
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS=	foreign
 SUBDIRS = QF
-includedir = $(prefix)/include
-include_HEADERS = cdaudio.h fbset.h in_win.h input.h joystick.h sound.h
-EXTRA_DIST =
+EXTRA_DIST = fbset.h in_win.h
--- a/include/QF/cdaudio.h
+++ b/include/QF/cdaudio.h
--- a/include/QF/input.h
+++ b/include/QF/input.h
--- a/include/QF/joystick.h
+++ b/include/QF/joystick.h
--- a/include/QF/sound.h
+++ b/include/QF/sound.h
--- a/libs/audio/cd/cd_null.c
+++ b/libs/audio/cd/cd_null.c
@ -30,7 +30,7 @@
 # include "config.h"
 #endif

-#include "QF/cdaudio.h"
+#include "cdaudio.h"

 void
 CDAudio_Play (byte track, qboolean looping)
--- a/libs/audio/targets/snd_alsa_0_5.c
+++ b/libs/audio/targets/snd_alsa_0_5.c
@ -56,7 +56,7 @@

 #include "QF/console.h"
 #include "QF/qargs.h"
-#include "sound.h"
+#include "QF/sound.h"

 #ifndef MAP_FAILED
 # define MAP_FAILED ((void*)-1)
--- a/libs/audio/targets/snd_alsa_0_9.c
+++ b/libs/audio/targets/snd_alsa_0_9.c
@ -36,7 +36,7 @@
 #include <sys/asoundlib.h>

 #include "QF/qtypes.h"
-#include "sound.h"
+#include "QF/sound.h"
 #include "QF/qargs.h"
 #include "QF/console.h"

--- a/libs/audio/targets/snd_disk.c
+++ b/libs/audio/targets/snd_disk.c
@ -40,7 +40,7 @@
 #include <sys/types.h>

 #include "QF/console.h"
-#include "sound.h"
+#include "QF/sound.h"
 #include "QF/qargs.h"

 static int  snd_inited;
--- a/libs/audio/targets/snd_dma.c
+++ b/libs/audio/targets/snd_dma.c
@ -49,12 +49,7 @@ void IN_Accumulate (void);//XXX FIXME
 #include "QF/model.h"
 #include "QF/qargs.h"
 #include "QF/sys.h"
-#include "sound.h"
-
-#ifdef _WIN32
-#include "winquake.h"
-#include "in_win.h"
-#endif
+#include "QF/sound.h"

 void        S_Play (void);
 void        S_PlayVol (void);
--- a/libs/audio/targets/snd_mem.c
+++ b/libs/audio/targets/snd_mem.c
@ -39,7 +39,7 @@
 #include "QF/console.h"
 #include "QF/qendian.h"
 #include "QF/quakefs.h"
-#include "sound.h"
+#include "QF/sound.h"
 #include "QF/sys.h"

 int         cache_full_cycle;
--- a/libs/audio/targets/snd_mix.c
+++ b/libs/audio/targets/snd_mix.c
@ -38,7 +38,7 @@

 #include "QF/compat.h"
 #include "QF/console.h"
-#include "sound.h"
+#include "QF/sound.h"

 #ifdef _WIN32
 # include "winquake.h"
--- a/libs/audio/targets/snd_null.c
+++ b/libs/audio/targets/snd_null.c
@ -30,7 +30,7 @@
 */

 #include "QF/qtypes.h"
-#include "sound.h"
+#include "QF/sound.h"

 // =======================================================================
 // Various variables also defined in snd_dma.c
--- a/libs/audio/targets/snd_oss.c
+++ b/libs/audio/targets/snd_oss.c
@ -58,7 +58,7 @@
 #include "QF/cmd.h"
 #include "QF/console.h"
 #include "QF/qargs.h"
-#include "sound.h"
+#include "QF/sound.h"

 #ifndef MAP_FAILED
 # define MAP_FAILED ((void *) -1)
--- a/libs/audio/targets/snd_sdl.c
+++ b/libs/audio/targets/snd_sdl.c
@ -36,7 +36,7 @@
 #include "QF/cmd.h"
 #include "QF/console.h"
 #include "QF/qargs.h"
-#include "sound.h"
+#include "QF/sound.h"

 static dma_t the_shm;
 static int  snd_inited;
--- a/libs/audio/targets/snd_sgi.c
+++ b/libs/audio/targets/snd_sgi.c
@ -36,7 +36,7 @@
 #include "QF/console.h"
 #include "QF/qtypes.h"
 #include "QF/qargs.h"
-#include "sound.h"
+#include "QF/sound.h"

 static int  snd_inited = 0;
 static ALconfig alc;
--- a/libs/audio/targets/snd_sun.c
+++ b/libs/audio/targets/snd_sun.c
@ -49,7 +49,7 @@
 #include "QF/console.h"
 #include "QF/qtypes.h"
 #include "QF/qargs.h"
-#include "sound.h"
+#include "QF/sound.h"

 int         audio_fd;
 int         snd_inited;
--- a/libs/audio/targets/snd_win.c
+++ b/libs/audio/targets/snd_win.c
@ -35,7 +35,7 @@
 #include "winquake.h"
 #include "QF/qargs.h"
 #include "QF/console.h"
-#include "sound.h"
+#include "QF/sound.h"

 #define iDirectSoundCreate(a,b,c)	pDirectSoundCreate(a,b,c)

--- a/nq/include/client.h
+++ b/nq/include/client.h
@ -36,7 +36,7 @@
 #include "protocol.h"
 #include "net.h"
 #include "QF/model.h"
-#include "sound.h"
+#include "QF/sound.h"
 #include "render.h"
 #include "QF/cvar.h"
 #include "QF/quakefs.h"
--- a/nq/source/cl_main.c
+++ b/nq/source/cl_main.c
@ -35,7 +35,7 @@
 #include "QF/cvar.h"
 #include "client.h"
 #include "chase.h"
-#include "input.h"
+#include "QF/input.h"
 #include "host.h"
 #include "QF/va.h"
 #include "host.h"
--- a/nq/source/cl_parse.c
+++ b/nq/source/cl_parse.c
@ -35,7 +35,7 @@

 #include "client.h"
 #include "host.h"
-#include "cdaudio.h"
+#include "QF/cdaudio.h"
 #include "QF/cmd.h"
 #include "QF/console.h"
 #include "QF/msg.h"
@ -43,9 +43,9 @@
 #include "sbar.h"
 #include "screen.h"
 #include "server.h"
-#include "sound.h" // FIXME: DEFAULT_SOUND_PACKET_*
+#include "QF/sound.h" // FIXME: DEFAULT_SOUND_PACKET_*
 #include "game.h"
-#include "input.h"
+#include "QF/input.h"

 char       *svc_strings[] = {
 	"svc_bad",
--- a/nq/source/console.c
+++ b/nq/source/console.c
@ -43,7 +43,7 @@
 #include "QF/console.h"
 #include "draw.h"
 #include "host.h"
-#include "input.h"
+#include "QF/input.h"
 #include "QF/keys.h"
 #include "QF/qargs.h"
 #include "screen.h"
--- a/nq/source/context_x11.c
+++ b/nq/source/context_x11.c
@ -65,7 +65,7 @@
 #include "QF/sys.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
-#include "input.h"
+#include "QF/input.h"

 static void (*event_handlers[LASTEvent]) (XEvent *);
 qboolean    oktodraw = false;
--- a/nq/source/draw.c
+++ b/nq/source/draw.c
@ -36,7 +36,7 @@
 #include "QF/sys.h"
 #include "QF/quakefs.h"
 #include "d_iface.h"
-#include "sound.h"
+#include "QF/sound.h"

 typedef struct {
 	vrect_t     rect;
--- a/nq/source/gl_screen.c
+++ b/nq/source/gl_screen.c
@ -37,7 +37,7 @@
 #include <time.h>

 #include "QF/compat.h"
-#include "input.h"
+#include "QF/input.h"
 #include "QF/qendian.h"
 #include "vid.h"
 #include "QF/sys.h"
@ -52,7 +52,7 @@
 #include "QF/keys.h"
 #include "QF/cmd.h"
 #include "sbar.h"
-#include "sound.h"
+#include "QF/sound.h"
 #include "screen.h"
 #include "render.h"						// needed by: client.h, gl_model.h,
 										// glquake.h
--- a/nq/source/host.c
+++ b/nq/source/host.c
@ -36,7 +36,7 @@
 #include "server.h"
 #include "view.h"
 #include "chase.h"
-#include "cdaudio.h"
+#include "QF/cdaudio.h"
 #include "QF/cmd.h"
 #include "QF/console.h"
 #include "QF/keys.h"
@ -47,7 +47,7 @@
 #include "sbar.h"
 #include "vid.h"
 #include "draw.h"
-#include "input.h"
+#include "QF/input.h"
 #include "screen.h"
 #include "gib.h"
 #include "sv_progs.h"
--- a/nq/source/in_sdl.c
+++ b/nq/source/in_sdl.c
@ -38,8 +38,8 @@
 #include "QF/cvar.h"
 #include "draw.h"
 #include "host.h"
-#include "input.h"
-#include "joystick.h"
+#include "QF/input.h"
+#include "QF/joystick.h"
 #include "QF/keys.h"
 #include "QF/sys.h"
 #include "QF/qargs.h"
--- a/nq/source/in_svgalib.c
+++ b/nq/source/in_svgalib.c
@ -49,8 +49,8 @@
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "host.h"
-#include "input.h"
-#include "joystick.h"
+#include "QF/input.h"
+#include "QF/joystick.h"
 #include "QF/keys.h"
 #include "QF/qargs.h"
 #include "QF/sys.h"
--- a/nq/source/in_x11.c
+++ b/nq/source/in_x11.c
@ -64,8 +64,8 @@
 #include "QF/cvar.h"
 #include "dga_check.h"
 #include "host.h"
-#include "input.h"
-#include "joystick.h"
+#include "QF/input.h"
+#include "QF/joystick.h"
 #include "QF/keys.h"
 #include "QF/qargs.h"
 #include "QF/sys.h"
--- a/nq/source/screen.c
+++ b/nq/source/screen.c
@ -35,7 +35,7 @@
 #include "QF/cmd.h"
 #include "screen.h"
 #include "sbar.h"
-#include "input.h"
+#include "QF/input.h"
 #include "view.h"
 #include "host.h"
 #include "QF/sys.h"
--- a/nq/source/vid_common_gl.c
+++ b/nq/source/vid_common_gl.c
@ -52,7 +52,7 @@

 #include "QF/console.h"
 #include "glquake.h"
-#include "input.h"
+#include "QF/input.h"
 #include "QF/qargs.h"
 #include "QF/quakefs.h"
 #include "sbar.h"
--- a/nq/source/vid_fbdev.c
+++ b/nq/source/vid_fbdev.c
@ -63,7 +63,7 @@
 #include "QF/cvar.h"
 #include "d_local.h"
 #include "host.h"
-#include "input.h"
+#include "QF/input.h"
 #include "QF/qargs.h"
 #include "QF/qendian.h"
 #include "QF/sys.h"
--- a/nq/source/vid_glx.c
+++ b/nq/source/vid_glx.c
@ -48,7 +48,7 @@
 #include "context_x11.h"
 #include "glquake.h"
 #include "host.h"
-#include "input.h"
+#include "QF/input.h"
 #include "QF/qargs.h"
 #include "QF/qendian.h"
 #include "QF/quakefs.h"
--- a/nq/source/vid_svgalib.c
+++ b/nq/source/vid_svgalib.c
@ -53,7 +53,7 @@
 #include "QF/cvar.h"
 #include "d_local.h"
 #include "host.h"
-#include "input.h"
+#include "QF/input.h"
 #include "QF/qargs.h"
 #include "QF/qendian.h"
 #include "QF/sys.h"
--- a/nq/source/vid_x11.c
+++ b/nq/source/vid_x11.c
@ -59,12 +59,11 @@
 #include "QF/cvar.h"
 #include "QF/sys.h"
 #include "QF/cmd.h"
-#include "input.h"
+#include "QF/input.h"
 #include "draw.h"
 #include "QF/console.h"
 #include "QF/va.h"
 #include "client.h"
-#include "input.h"
 #include "context_x11.h"
 #include "host.h"

--- a/qw/source/cl_input.c
+++ b/qw/source/cl_input.c
@ -45,7 +45,7 @@
 #include "QF/cmd.h"
 #include "QF/console.h"
 #include "host.h"
-#include "input.h"
+#include "QF/input.h"
 #include "QF/keys.h"
 #include "QF/msg.h"
 #include "msg_ucmd.h"
--- a/qw/source/cl_main.c
+++ b/qw/source/cl_main.c
@ -60,7 +60,7 @@

 #include "bothdefs.h"
 #include "buildnum.h"
-#include "cdaudio.h"
+#include "QF/cdaudio.h"
 #include "cl_cam.h"
 #include "cl_demo.h"
 #include "cl_ents.h"
@ -78,7 +78,7 @@
 #include "draw.h"
 #include "game.h"
 #include "host.h"
-#include "input.h"
+#include "QF/input.h"
 #include "QF/keys.h"
 #include "QF/model.h"
 #include "QF/msg.h"
@ -90,7 +90,7 @@
 #include "sbar.h"
 #include "screen.h"
 #include "skin.h"
-#include "sound.h"
+#include "QF/sound.h"
 #include "QF/sys.h"
 #include "teamplay.h"
 #include "vid.h"
--- a/qw/source/cl_parse.c
+++ b/qw/source/cl_parse.c
@ -44,7 +44,7 @@
 #endif

 #include "bothdefs.h"
-#include "cdaudio.h"
+#include "QF/cdaudio.h"
 #include "cl_ents.h"
 #include "cl_input.h"
 #include "cl_main.h"
@ -61,7 +61,7 @@
 #include "screen.h"
 #include "sbar.h"
 #include "skin.h"
-#include "sound.h"
+#include "QF/sound.h"
 #include "teamplay.h"
 #include "QF/va.h"
 #include "view.h"
--- a/qw/source/cl_tent.c
+++ b/qw/source/cl_tent.c
@ -48,7 +48,7 @@
 #include "QF/model.h"
 #include "QF/msg.h"
 #include "r_dynamic.h"
-#include "sound.h"
+#include "QF/sound.h"

 #define	MAX_BEAMS	8
 #define MAX_BEAM_ENTS 20
--- a/qw/source/console.c
+++ b/qw/source/console.c
@ -42,7 +42,7 @@
 #include "QF/cmd.h"
 #include "QF/console.h"
 #include "draw.h"
-#include "input.h"
+#include "QF/input.h"
 #include "QF/keys.h"
 #include "QF/qargs.h"
 #include "screen.h"
--- a/qw/source/context_x11.c
+++ b/qw/source/context_x11.c
@ -64,7 +64,7 @@
 #include "context_x11.h"
 #include "QF/cvar.h"
 #include "dga_check.h"
-#include "input.h"
+#include "QF/input.h"
 #include "QF/qargs.h"
 #include "QF/qtypes.h"
 #include "QF/sys.h"
--- a/qw/source/draw.c
+++ b/qw/source/draw.c
@ -41,7 +41,7 @@
 #include "d_iface.h"
 #include "draw.h"
 #include "QF/quakefs.h"
-#include "sound.h"
+#include "QF/sound.h"
 #include "QF/sys.h"

 typedef struct {
--- a/qw/source/gl_rmain.c
+++ b/qw/source/gl_rmain.c
@ -52,7 +52,7 @@
 #include "QF/qargs.h"
 #include "r_dynamic.h"
 #include "skin.h"
-#include "sound.h"
+#include "QF/sound.h"
 #include "QF/sys.h"
 #include "view.h"

--- a/qw/source/in_sdl.c
+++ b/qw/source/in_sdl.c
@ -39,8 +39,8 @@
 #include "QF/cvar.h"
 #include "draw.h"
 #include "host.h"
-#include "input.h"
-#include "joystick.h"
+#include "QF/input.h"
+#include "QF/joystick.h"
 #include "QF/keys.h"
 #include "QF/sys.h"
 #include "QF/qargs.h"
--- a/qw/source/in_svgalib.c
+++ b/qw/source/in_svgalib.c
@ -49,8 +49,8 @@
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "host.h"
-#include "input.h"
-#include "joystick.h"
+#include "QF/input.h"
+#include "QF/joystick.h"
 #include "QF/keys.h"
 #include "QF/qargs.h"
 #include "QF/sys.h"
--- a/qw/source/in_x11.c
+++ b/qw/source/in_x11.c
@ -64,8 +64,8 @@
 #include "QF/cvar.h"
 #include "dga_check.h"
 #include "host.h"
-#include "input.h"
-#include "joystick.h"
+#include "QF/input.h"
+#include "QF/joystick.h"
 #include "QF/keys.h"
 #include "QF/qargs.h"
 #include "QF/sys.h"
--- a/qw/source/sv_send.c
+++ b/qw/source/sv_send.c
@ -44,7 +44,7 @@
 #include "server.h"
 #include "sv_progs.h"
 #include "QF/sys.h"
-#include "sound.h" // FIXME: DEFAULT_SOUND_PACKET_*
+#include "QF/sound.h" // FIXME: DEFAULT_SOUND_PACKET_*

 #define CHAN_AUTO   0
 #define CHAN_WEAPON 1
--- a/qw/source/sw_redge.c
+++ b/qw/source/sw_redge.c
@ -32,7 +32,7 @@

 #include "d_ifacea.h"
 #include "r_local.h"
-#include "sound.h"
+#include "QF/sound.h"

 #if 0
 // FIXME
--- a/qw/source/sw_rmain.c
+++ b/qw/source/sw_rmain.c
@ -48,7 +48,7 @@
 #include "r_dynamic.h"
 #include "r_local.h"
 #include "screen.h"
-#include "sound.h"
+#include "QF/sound.h"
 #include "QF/sys.h"
 #include "view.h"

--- a/qw/source/vid_common_gl.c
+++ b/qw/source/vid_common_gl.c
@ -46,7 +46,7 @@

 #include "QF/console.h"
 #include "glquake.h"
-#include "input.h"
+#include "QF/input.h"
 #include "QF/qargs.h"
 #include "qfgl_ext.h"
 #include "QF/quakefs.h"
--- a/qw/source/vid_fbdev.c
+++ b/qw/source/vid_fbdev.c
@ -63,7 +63,7 @@
 #include "QF/cvar.h"
 #include "d_local.h"
 #include "host.h"
-#include "input.h"
+#include "QF/input.h"
 #include "QF/qargs.h"
 #include "QF/qendian.h"
 #include "QF/sys.h"
--- a/qw/source/vid_glx.c
+++ b/qw/source/vid_glx.c
@ -51,7 +51,7 @@
 #include "context_x11.h"
 #include "glquake.h"
 #include "host.h"
-#include "input.h"
+#include "QF/input.h"
 #include "QF/qargs.h"
 #include "QF/qendian.h"
 #include "QF/quakefs.h"
--- a/qw/source/vid_svgalib.c
+++ b/qw/source/vid_svgalib.c
@ -52,7 +52,7 @@
 #include "QF/cvar.h"
 #include "d_local.h"
 #include "host.h"
-#include "input.h"
+#include "QF/input.h"
 #include "QF/qargs.h"
 #include "QF/qendian.h"
 #include "QF/sys.h"