From 8e2d89c4c28249e13599da26cd4a1705f85bbf7f Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Tue, 10 Apr 2001 21:45:42 +0000 Subject: [PATCH] fix up a mis-understanding about api headers *taniwha larts himself for not explaining things to Despair --- include/Makefile.am | 4 +--- include/{ => QF}/cdaudio.h | 0 include/{ => QF}/input.h | 0 include/{ => QF}/joystick.h | 0 include/{ => QF}/sound.h | 0 libs/audio/cd/cd_null.c | 2 +- libs/audio/targets/snd_alsa_0_5.c | 2 +- libs/audio/targets/snd_alsa_0_9.c | 2 +- libs/audio/targets/snd_disk.c | 2 +- libs/audio/targets/snd_dma.c | 7 +------ libs/audio/targets/snd_mem.c | 2 +- libs/audio/targets/snd_mix.c | 2 +- libs/audio/targets/snd_null.c | 2 +- libs/audio/targets/snd_oss.c | 2 +- libs/audio/targets/snd_sdl.c | 2 +- libs/audio/targets/snd_sgi.c | 2 +- libs/audio/targets/snd_sun.c | 2 +- libs/audio/targets/snd_win.c | 2 +- nq/include/client.h | 2 +- nq/source/cl_main.c | 2 +- nq/source/cl_parse.c | 6 +++--- nq/source/console.c | 2 +- nq/source/context_x11.c | 2 +- nq/source/draw.c | 2 +- nq/source/gl_screen.c | 4 ++-- nq/source/host.c | 4 ++-- nq/source/in_sdl.c | 4 ++-- nq/source/in_svgalib.c | 4 ++-- nq/source/in_x11.c | 4 ++-- nq/source/screen.c | 2 +- nq/source/vid_common_gl.c | 2 +- nq/source/vid_fbdev.c | 2 +- nq/source/vid_glx.c | 2 +- nq/source/vid_svgalib.c | 2 +- nq/source/vid_x11.c | 3 +-- qw/source/cl_input.c | 2 +- qw/source/cl_main.c | 6 +++--- qw/source/cl_parse.c | 4 ++-- qw/source/cl_tent.c | 2 +- qw/source/console.c | 2 +- qw/source/context_x11.c | 2 +- qw/source/draw.c | 2 +- qw/source/gl_rmain.c | 2 +- qw/source/in_sdl.c | 4 ++-- qw/source/in_svgalib.c | 4 ++-- qw/source/in_x11.c | 4 ++-- qw/source/sv_send.c | 2 +- qw/source/sw_redge.c | 2 +- qw/source/sw_rmain.c | 2 +- qw/source/vid_common_gl.c | 2 +- qw/source/vid_fbdev.c | 2 +- qw/source/vid_glx.c | 2 +- qw/source/vid_svgalib.c | 2 +- 53 files changed, 62 insertions(+), 70 deletions(-) rename include/{ => QF}/cdaudio.h (100%) rename include/{ => QF}/input.h (100%) rename include/{ => QF}/joystick.h (100%) rename include/{ => QF}/sound.h (100%) diff --git a/include/Makefile.am b/include/Makefile.am index a19ce8d90..d1461ac5d 100644 --- 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 diff --git a/include/cdaudio.h b/include/QF/cdaudio.h similarity index 100% rename from include/cdaudio.h rename to include/QF/cdaudio.h diff --git a/include/input.h b/include/QF/input.h similarity index 100% rename from include/input.h rename to include/QF/input.h diff --git a/include/joystick.h b/include/QF/joystick.h similarity index 100% rename from include/joystick.h rename to include/QF/joystick.h diff --git a/include/sound.h b/include/QF/sound.h similarity index 100% rename from include/sound.h rename to include/QF/sound.h diff --git a/libs/audio/cd/cd_null.c b/libs/audio/cd/cd_null.c index 2680f225a..1a9c7cc67 100644 --- 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) diff --git a/libs/audio/targets/snd_alsa_0_5.c b/libs/audio/targets/snd_alsa_0_5.c index a59fdd9cc..784a1ff2d 100644 --- 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) diff --git a/libs/audio/targets/snd_alsa_0_9.c b/libs/audio/targets/snd_alsa_0_9.c index 8f33c54e0..978fdef50 100644 --- a/libs/audio/targets/snd_alsa_0_9.c +++ b/libs/audio/targets/snd_alsa_0_9.c @@ -36,7 +36,7 @@ #include #include "QF/qtypes.h" -#include "sound.h" +#include "QF/sound.h" #include "QF/qargs.h" #include "QF/console.h" diff --git a/libs/audio/targets/snd_disk.c b/libs/audio/targets/snd_disk.c index e45b22d9a..68e2c7169 100644 --- a/libs/audio/targets/snd_disk.c +++ b/libs/audio/targets/snd_disk.c @@ -40,7 +40,7 @@ #include #include "QF/console.h" -#include "sound.h" +#include "QF/sound.h" #include "QF/qargs.h" static int snd_inited; diff --git a/libs/audio/targets/snd_dma.c b/libs/audio/targets/snd_dma.c index 09b1cf233..c5c9b3165 100644 --- 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); diff --git a/libs/audio/targets/snd_mem.c b/libs/audio/targets/snd_mem.c index 03f70162b..ccbc32d2d 100644 --- 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; diff --git a/libs/audio/targets/snd_mix.c b/libs/audio/targets/snd_mix.c index 947914c24..654dbae0a 100644 --- 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" diff --git a/libs/audio/targets/snd_null.c b/libs/audio/targets/snd_null.c index f7b6dc9fb..5d60afa67 100644 --- 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 diff --git a/libs/audio/targets/snd_oss.c b/libs/audio/targets/snd_oss.c index 03dd17335..2661fd6a1 100644 --- 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) diff --git a/libs/audio/targets/snd_sdl.c b/libs/audio/targets/snd_sdl.c index a33fc6ddb..dbad4178e 100644 --- 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; diff --git a/libs/audio/targets/snd_sgi.c b/libs/audio/targets/snd_sgi.c index 789388761..5048f17ed 100644 --- 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; diff --git a/libs/audio/targets/snd_sun.c b/libs/audio/targets/snd_sun.c index f573e2353..8bd7052bd 100644 --- 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; diff --git a/libs/audio/targets/snd_win.c b/libs/audio/targets/snd_win.c index 1b2bb086f..3fadfb114 100644 --- 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) diff --git a/nq/include/client.h b/nq/include/client.h index 1fb9bc2e0..14149a6ba 100644 --- 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" diff --git a/nq/source/cl_main.c b/nq/source/cl_main.c index 5d0bebbc2..8ed8d81cd 100644 --- 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" diff --git a/nq/source/cl_parse.c b/nq/source/cl_parse.c index 401d7fa0a..bcf85010a 100644 --- 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", diff --git a/nq/source/console.c b/nq/source/console.c index 687196c18..579b4cc8a 100644 --- 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" diff --git a/nq/source/context_x11.c b/nq/source/context_x11.c index 808ab8a8e..4c859b432 100644 --- 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; diff --git a/nq/source/draw.c b/nq/source/draw.c index 57477fe84..f8178a88c 100644 --- 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; diff --git a/nq/source/gl_screen.c b/nq/source/gl_screen.c index 5369591f7..324146b34 100644 --- a/nq/source/gl_screen.c +++ b/nq/source/gl_screen.c @@ -37,7 +37,7 @@ #include #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 diff --git a/nq/source/host.c b/nq/source/host.c index b19da9083..7c5eda0c6 100644 --- 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" diff --git a/nq/source/in_sdl.c b/nq/source/in_sdl.c index 4d142f047..096512049 100644 --- 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" diff --git a/nq/source/in_svgalib.c b/nq/source/in_svgalib.c index 6f2595e81..776fd7134 100644 --- 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" diff --git a/nq/source/in_x11.c b/nq/source/in_x11.c index d09dca038..b52c06cc4 100644 --- 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" diff --git a/nq/source/screen.c b/nq/source/screen.c index 835bc8cb6..ad9efc042 100644 --- 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" diff --git a/nq/source/vid_common_gl.c b/nq/source/vid_common_gl.c index fde3b13d8..f80fc8986 100644 --- 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" diff --git a/nq/source/vid_fbdev.c b/nq/source/vid_fbdev.c index 1d775eed7..225696cd4 100644 --- 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" diff --git a/nq/source/vid_glx.c b/nq/source/vid_glx.c index 85ba4b204..9ca0fcf76 100644 --- 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" diff --git a/nq/source/vid_svgalib.c b/nq/source/vid_svgalib.c index 8bd96a331..5e0e43987 100644 --- 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" diff --git a/nq/source/vid_x11.c b/nq/source/vid_x11.c index 1c544c1bd..dc03cc6b5 100644 --- 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" diff --git a/qw/source/cl_input.c b/qw/source/cl_input.c index 4cc5724f9..0869f4527 100644 --- 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" diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c index 83ddb6119..68ac3c68e 100644 --- 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" diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c index 63af540cc..242ef25f7 100644 --- 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" diff --git a/qw/source/cl_tent.c b/qw/source/cl_tent.c index 04c349ea4..9e371064e 100644 --- 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 diff --git a/qw/source/console.c b/qw/source/console.c index 97a27d328..fdec865ce 100644 --- 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" diff --git a/qw/source/context_x11.c b/qw/source/context_x11.c index 544896930..ccf2111ac 100644 --- 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" diff --git a/qw/source/draw.c b/qw/source/draw.c index 365dbe67c..fd259eddf 100644 --- 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 { diff --git a/qw/source/gl_rmain.c b/qw/source/gl_rmain.c index 7c0aa9d96..ad6c3eb2e 100644 --- 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" diff --git a/qw/source/in_sdl.c b/qw/source/in_sdl.c index 83c337765..4d533d39d 100644 --- 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" diff --git a/qw/source/in_svgalib.c b/qw/source/in_svgalib.c index 99ab65dc4..34a6f33ae 100644 --- 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" diff --git a/qw/source/in_x11.c b/qw/source/in_x11.c index 6d2054b3b..5ddf89009 100644 --- 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" diff --git a/qw/source/sv_send.c b/qw/source/sv_send.c index 5821e6942..2cbac5181 100644 --- 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 diff --git a/qw/source/sw_redge.c b/qw/source/sw_redge.c index 1745a4bea..025a7313b 100644 --- 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 diff --git a/qw/source/sw_rmain.c b/qw/source/sw_rmain.c index 10cd83b59..82e3c8be6 100644 --- 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" diff --git a/qw/source/vid_common_gl.c b/qw/source/vid_common_gl.c index 09bbab83d..a7298887c 100644 --- 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" diff --git a/qw/source/vid_fbdev.c b/qw/source/vid_fbdev.c index 32e2cc6a3..1bb07ec7e 100644 --- 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" diff --git a/qw/source/vid_glx.c b/qw/source/vid_glx.c index 12910c398..1e4ef900a 100644 --- 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" diff --git a/qw/source/vid_svgalib.c b/qw/source/vid_svgalib.c index ed7cd8480..0029c3c90 100644 --- 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"