From 2b81eaea6cbd220b21bab77852a46d982fba5608 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Tue, 6 Nov 2007 12:40:38 +0000 Subject: [PATCH] console.h include cleanup --- include/winquake.h | 1 - libs/gamecode/builtins/Makefile.am | 2 +- libs/models/sprite/gl_model_sprite.c | 1 - libs/net/nc/net_udp.c | 1 - libs/net/nc/net_udp6.c | 1 - libs/net/net_chan.c | 1 - libs/net/net_main.c | 1 - libs/net/nm/net_dgrm.c | 1 - libs/net/nm/net_loop.c | 1 - libs/net/nm/net_udp.c | 1 - libs/net/nm/net_wins.c | 1 - libs/video/renderer/r_efrag.c | 1 - libs/video/renderer/r_ent.c | 1 - libs/video/renderer/r_part.c | 1 - libs/video/targets/in_sdl.c | 1 - libs/video/targets/joy_null.c | 1 - libs/video/targets/vid_3dfxsvga.c | 1 + libs/video/targets/vid_svgalib.c | 1 + libs/video/targets/vid_wgl.c | 1 + 19 files changed, 4 insertions(+), 16 deletions(-) diff --git a/include/winquake.h b/include/winquake.h index 3f9ea0957..02cc1952b 100644 --- a/include/winquake.h +++ b/include/winquake.h @@ -81,7 +81,6 @@ extern LPDIRECTDRAWPALETTE lpDDPal; extern LPDIRECTSOUND pDS; extern LPDIRECTSOUNDBUFFER pDSBuf; #endif -extern DWORD gSndBufSize; void VID_LockBuffer (void); void VID_UnlockBuffer (void); void VID_UpdateWindowStatus (int window_x, int window_y); diff --git a/libs/gamecode/builtins/Makefile.am b/libs/gamecode/builtins/Makefile.am index 784566084..151b548d9 100644 --- a/libs/gamecode/builtins/Makefile.am +++ b/libs/gamecode/builtins/Makefile.am @@ -6,5 +6,5 @@ INCLUDES= -I$(top_srcdir)/include lib_LTLIBRARIES= libQFgamecode_builtins.la libQFgamecode_builtins_la_LDFLAGS= -version-info 1:0:0 -no-undefined -libQFgamecode_builtins_la_LIBADD= $(top_builddir)/libs/gamecode/engine/libQFgamecode.la $(top_builddir)/libs/gib/libQFgib.la +libQFgamecode_builtins_la_LIBADD= $(top_builddir)/libs/gamecode/engine/libQFgamecode.la $(top_builddir)/libs/gib/libQFgib.la $(top_builddir)/libs/util/libQFutil.la libQFgamecode_builtins_la_SOURCES= pr_cmds.c bi_gib.c diff --git a/libs/models/sprite/gl_model_sprite.c b/libs/models/sprite/gl_model_sprite.c index 2114b42b5..f8e4b6575 100644 --- a/libs/models/sprite/gl_model_sprite.c +++ b/libs/models/sprite/gl_model_sprite.c @@ -38,7 +38,6 @@ static __attribute__ ((used)) const char rcsid[] = # include #endif -#include "QF/console.h" #include "QF/image.h" #include "QF/model.h" #include "QF/quakefs.h" diff --git a/libs/net/nc/net_udp.c b/libs/net/nc/net_udp.c index fa8032669..08afcbd8a 100644 --- a/libs/net/nc/net_udp.c +++ b/libs/net/nc/net_udp.c @@ -68,7 +68,6 @@ static __attribute__ ((used)) const char rcsid[] = #include #include -#include "QF/console.h" #include "QF/cvar.h" #include "QF/dstring.h" #include "QF/msg.h" diff --git a/libs/net/nc/net_udp6.c b/libs/net/nc/net_udp6.c index e9fef19e5..384da014d 100644 --- a/libs/net/nc/net_udp6.c +++ b/libs/net/nc/net_udp6.c @@ -99,7 +99,6 @@ static __attribute__ ((used)) const char rcsid[] = #undef model_t -#include "QF/console.h" #include "QF/dstring.h" #include "QF/msg.h" #include "QF/qargs.h" diff --git a/libs/net/net_chan.c b/libs/net/net_chan.c index e014a0bd4..139ad4488 100644 --- a/libs/net/net_chan.c +++ b/libs/net/net_chan.c @@ -44,7 +44,6 @@ static __attribute__ ((used)) const char rcsid[] = #include #include -#include "QF/console.h" #include "QF/cvar.h" #include "QF/dstring.h" #include "QF/msg.h" diff --git a/libs/net/net_main.c b/libs/net/net_main.c index e551df73d..570cb52de 100644 --- a/libs/net/net_main.c +++ b/libs/net/net_main.c @@ -40,7 +40,6 @@ static __attribute__ ((used)) const char rcsid[] = #include "QF/cbuf.h" #include "QF/cmd.h" -#include "QF/console.h" #include "QF/cvar.h" #include "QF/msg.h" #include "QF/qargs.h" diff --git a/libs/net/nm/net_dgrm.c b/libs/net/nm/net_dgrm.c index 4b75c5ce7..2b3db4083 100644 --- a/libs/net/nm/net_dgrm.c +++ b/libs/net/nm/net_dgrm.c @@ -46,7 +46,6 @@ static __attribute__ ((used)) const char rcsid[] = #include "QF/msg.h" #include "QF/qargs.h" #include "QF/screen.h" -#include "QF/console.h" #include "netmain.h" diff --git a/libs/net/nm/net_loop.c b/libs/net/nm/net_loop.c index 5b915e84e..e343540c2 100644 --- a/libs/net/nm/net_loop.c +++ b/libs/net/nm/net_loop.c @@ -33,7 +33,6 @@ static __attribute__ ((used)) const char rcsid[] = #include "QF/cvar.h" #include "QF/msg.h" -#include "QF/console.h" #include "QF/sys.h" #include "netmain.h" diff --git a/libs/net/nm/net_udp.c b/libs/net/nm/net_udp.c index 74d12d3b8..96bbcd1c0 100644 --- a/libs/net/nm/net_udp.c +++ b/libs/net/nm/net_udp.c @@ -80,7 +80,6 @@ static __attribute__ ((used)) const char rcsid[] = #include #include -#include "QF/console.h" #include "QF/cvar.h" #include "QF/dstring.h" #include "QF/qargs.h" diff --git a/libs/net/nm/net_wins.c b/libs/net/nm/net_wins.c index 47950396b..359e08581 100644 --- a/libs/net/nm/net_wins.c +++ b/libs/net/nm/net_wins.c @@ -34,7 +34,6 @@ static __attribute__ ((used)) const char rcsid[] = #include "winquake.h" -#include "QF/console.h" #include "QF/cvar.h" #include "QF/qargs.h" #include "QF/sys.h" diff --git a/libs/video/renderer/r_efrag.c b/libs/video/renderer/r_efrag.c index 62e26e33e..763ebe86c 100644 --- a/libs/video/renderer/r_efrag.c +++ b/libs/video/renderer/r_efrag.c @@ -33,7 +33,6 @@ static __attribute__ ((used)) const char rcsid[] = #include -#include "QF/console.h" #include "QF/render.h" #include "QF/sys.h" diff --git a/libs/video/renderer/r_ent.c b/libs/video/renderer/r_ent.c index 693683166..ce28b6626 100644 --- a/libs/video/renderer/r_ent.c +++ b/libs/video/renderer/r_ent.c @@ -41,7 +41,6 @@ static __attribute__ ((used)) const char rcsid[] = #include #include -#include "QF/console.h" #include "QF/model.h" #include "QF/msg.h" #include "QF/render.h" diff --git a/libs/video/renderer/r_part.c b/libs/video/renderer/r_part.c index 43884201a..51e36ed78 100644 --- a/libs/video/renderer/r_part.c +++ b/libs/video/renderer/r_part.c @@ -31,7 +31,6 @@ static __attribute__ ((used)) const char rcsid[] = "$Id$"; -#include "QF/console.h" #include "QF/cvar.h" #include "QF/qargs.h" #include "QF/render.h" diff --git a/libs/video/targets/in_sdl.c b/libs/video/targets/in_sdl.c index bce68f0b5..08b72a470 100644 --- a/libs/video/targets/in_sdl.c +++ b/libs/video/targets/in_sdl.c @@ -34,7 +34,6 @@ static __attribute__ ((used)) const char rcsid[] = #include #include "QF/cdaudio.h" -#include "QF/console.h" #include "QF/cvar.h" #include "QF/input.h" #include "QF/joystick.h" diff --git a/libs/video/targets/joy_null.c b/libs/video/targets/joy_null.c index 296e2ffb5..07d2ee8ca 100644 --- a/libs/video/targets/joy_null.c +++ b/libs/video/targets/joy_null.c @@ -31,7 +31,6 @@ static __attribute__ ((used)) const char rcsid[] = "$Id$"; -#include "QF/console.h" #include "QF/cvar.h" #include "QF/joystick.h" #include "QF/qtypes.h" diff --git a/libs/video/targets/vid_3dfxsvga.c b/libs/video/targets/vid_3dfxsvga.c index f59d8e2b2..a32ddd3c9 100644 --- a/libs/video/targets/vid_3dfxsvga.c +++ b/libs/video/targets/vid_3dfxsvga.c @@ -46,6 +46,7 @@ static __attribute__ ((used)) const char rcsid[] = #include #include "QF/cvar.h" +#include "QF/console.h" #include "QF/qargs.h" #include "QF/qendian.h" #include "QF/sys.h" diff --git a/libs/video/targets/vid_svgalib.c b/libs/video/targets/vid_svgalib.c index e6d3f14a9..c8172043e 100644 --- a/libs/video/targets/vid_svgalib.c +++ b/libs/video/targets/vid_svgalib.c @@ -54,6 +54,7 @@ static __attribute__ ((used)) const char rcsid[] = #include #include "QF/cmd.h" +#include "QF/console.h" #include "QF/cvar.h" #include "QF/input.h" #include "QF/qargs.h" diff --git a/libs/video/targets/vid_wgl.c b/libs/video/targets/vid_wgl.c index e5073965a..45539a0d4 100644 --- a/libs/video/targets/vid_wgl.c +++ b/libs/video/targets/vid_wgl.c @@ -35,6 +35,7 @@ static __attribute__ ((used)) const char rcsid[] = #include "QF/cdaudio.h" #include "QF/cmd.h" +#include "QF/console.h" #include "QF/cvar.h" #include "QF/input.h" #include "QF/keys.h"