mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2025-01-19 15:10:56 +00:00
glquake.h now included from only the files that use OpenGL, and not from
common_quakedef.h (and thus all files) This solves a build break when the OpenGL includes are not in /usr/include, since the OpenGL include path is only used when compiling files that use OpenGL.
This commit is contained in:
parent
4b42baa382
commit
88344ef21a
26 changed files with 26 additions and 12 deletions
|
@ -75,7 +75,6 @@ void VID_UnlockBuffer (void);
|
|||
#include "crc.h"
|
||||
#include "cdaudio.h"
|
||||
|
||||
#include "glquake.h"
|
||||
#include "cvars.h"
|
||||
|
||||
#ifndef max
|
||||
|
@ -95,6 +94,13 @@ void VID_UnlockBuffer (void);
|
|||
#if !defined(HAVE_VSNPRINTF) && defined(HAVE__VSNPRINTF)
|
||||
# define vsnprintf _vsnprintf
|
||||
#endif
|
||||
#if !defined(HAVE_SNPRINTF) && !defined(HAVE__SNPRINTF)
|
||||
#ifdef HAVE_VSNPRINTF
|
||||
# define snprintf vsnprintf
|
||||
#elif defined(HAVE__VSNPRINTF)
|
||||
# define snprintf _vsnprintf
|
||||
#endif
|
||||
#endif
|
||||
|
||||
//=============================================================================
|
||||
|
||||
|
|
|
@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#define MAX_LBM_HEIGHT 200
|
||||
|
||||
#include "model.h"
|
||||
#include "glquake.h"
|
||||
|
||||
typedef struct
|
||||
{
|
||||
|
|
|
@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
// vid buffer
|
||||
|
||||
#include "quakedef.h"
|
||||
#include "glquake.h"
|
||||
|
||||
extern unsigned char d_15to8table[65536];
|
||||
extern cvar_t crosshair, cl_crossx, cl_crossy, crosshaircolor;
|
||||
|
|
|
@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
// gl_mesh.c: triangle model functions
|
||||
|
||||
#include "quakedef.h"
|
||||
#include "glquake.h"
|
||||
|
||||
/*
|
||||
=================================================================
|
||||
|
|
|
@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
// r_efrag.c
|
||||
|
||||
#include "quakedef.h"
|
||||
#include "glquake.h"
|
||||
|
||||
mnode_t *r_pefragtopnode;
|
||||
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
*/
|
||||
|
||||
#include "quakedef.h"
|
||||
#include "glquake.h"
|
||||
|
||||
entity_t r_worldentity;
|
||||
|
||||
|
|
|
@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
// r_misc.c
|
||||
|
||||
#include "quakedef.h"
|
||||
#include "glquake.h"
|
||||
|
||||
extern void R_InitBubble();
|
||||
|
||||
|
|
|
@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
// r_surf.c: surrface-related refresh code
|
||||
|
||||
#include "quakedef.h"
|
||||
#include "glquake.h"
|
||||
|
||||
int skytexturenum;
|
||||
|
||||
|
|
|
@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
*/
|
||||
|
||||
#include "quakedef.h"
|
||||
#include "glquake.h"
|
||||
|
||||
#ifdef GLTEST
|
||||
|
||||
|
|
|
@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
*/
|
||||
|
||||
#include "quakedef.h"
|
||||
#include "glquake.h"
|
||||
|
||||
#ifndef _EXPERIMENTAL_
|
||||
# undef HAS_DGA
|
||||
|
|
|
@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
// view.c -- player eye positioning
|
||||
|
||||
#include "quakedef.h"
|
||||
#include "glquake.h"
|
||||
#include "r_local.h"
|
||||
|
||||
extern int onground;
|
||||
|
|
|
@ -28,6 +28,7 @@ Portions Copyright (C) 1999,2000 Nelson Rush.
|
|||
*/
|
||||
|
||||
#include "quakedef.h"
|
||||
#include "glquake.h"
|
||||
|
||||
extern model_t *loadmodel;
|
||||
|
||||
|
|
|
@ -24,8 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#ifndef _GLQUAKE_H
|
||||
#define _GLQUAKE_H
|
||||
|
||||
#ifdef HAS_OGL
|
||||
|
||||
#if !defined(__GNUC__) && !defined(__unix) && !defined(__unix__)
|
||||
#pragma warning(disable : 4244) // MIPS
|
||||
#pragma warning(disable : 4136) // X86
|
||||
|
@ -283,6 +281,4 @@ void GL_BuildLightmaps (void);
|
|||
// gl_ngraph.c
|
||||
//
|
||||
void R_NetGraph (void);
|
||||
|
||||
#endif // HAS_OGL
|
||||
#endif // _GLQUAKE_H
|
||||
|
|
|
@ -25,7 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#include "r_local.h"
|
||||
|
||||
#include "d_iface.h"
|
||||
#include "glquake.h"
|
||||
|
||||
extern particle_t *active_particles, *free_particles;
|
||||
extern int ramp1[8], ramp2[8], ramp3[8];
|
||||
|
|
|
@ -25,7 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#include "quakedef.h"
|
||||
#include "model.h"
|
||||
#include "pmove.h"
|
||||
#include "glquake.h"
|
||||
|
||||
char *svc_strings[] =
|
||||
{
|
||||
|
|
|
@ -26,6 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
// on the same machine.
|
||||
|
||||
#include "quakedef.h"
|
||||
#include "glquake.h"
|
||||
|
||||
model_t *loadmodel;
|
||||
char loadname[32]; // for hunk tags
|
||||
|
|
|
@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
// gl_ngraph.c
|
||||
|
||||
#include "quakedef.h"
|
||||
#include "glquake.h"
|
||||
|
||||
extern byte *draw_chars; // 8*8 graphic characters
|
||||
|
||||
|
|
|
@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
// r_light.c
|
||||
|
||||
#include "quakedef.h"
|
||||
#include "glquake.h"
|
||||
|
||||
int r_dlightframecount;
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
// screen.c -- master for refresh, status bar, console, chat, notify, etc
|
||||
|
||||
#include "quakedef.h"
|
||||
|
||||
#include "glquake.h"
|
||||
#include <time.h>
|
||||
|
||||
/*
|
||||
|
|
|
@ -25,7 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#include "r_local.h"
|
||||
|
||||
#include "d_iface.h"
|
||||
#include "glquake.h"
|
||||
|
||||
#define MAX_PARTICLES 2048 // default max # of particles at one
|
||||
// time
|
||||
|
|
|
@ -25,7 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#include "quakedef.h"
|
||||
#include "model.h"
|
||||
#include "pmove.h"
|
||||
#include "glquake.h"
|
||||
|
||||
/*
|
||||
=====================
|
||||
|
|
|
@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
// cl_parse.c -- parse a message received from the server
|
||||
|
||||
#include "quakedef.h"
|
||||
|
||||
#include "glquake.h"
|
||||
entity_t *CL_EntityNum (int num);
|
||||
|
||||
/*
|
||||
|
|
|
@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
// on the same machine.
|
||||
|
||||
#include "quakedef.h"
|
||||
#include "glquake.h"
|
||||
|
||||
model_t *loadmodel;
|
||||
char loadname[32]; // for hunk tags
|
||||
|
|
|
@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
// r_light.c
|
||||
|
||||
#include "quakedef.h"
|
||||
#include "glquake.h"
|
||||
|
||||
int r_dlightframecount;
|
||||
|
||||
|
|
|
@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
*/
|
||||
|
||||
#include "quakedef.h"
|
||||
#include "glquake.h"
|
||||
#include "r_local.h"
|
||||
|
||||
extern particle_t *active_particles, *free_particles;
|
||||
|
|
|
@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
// screen.c -- master for refresh, status bar, console, chat, notify, etc
|
||||
|
||||
#include "quakedef.h"
|
||||
#include "glquake.h"
|
||||
|
||||
#include <time.h>
|
||||
|
||||
|
|
Loading…
Reference in a new issue