mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-01-17 22:50:51 +00:00
files under inclue/QF are not allowed to include files from include (eg,
including config.h is a nono).
This commit is contained in:
parent
7801aac441
commit
4699bf6d5b
11 changed files with 4 additions and 79 deletions
|
@ -29,14 +29,6 @@
|
||||||
#ifndef __gl_defines_h
|
#ifndef __gl_defines_h
|
||||||
#define __gl_defines_h
|
#define __gl_defines_h
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
# include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_WINDOWS_H
|
|
||||||
# include <windows.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "QF/qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -29,13 +29,6 @@
|
||||||
#ifndef __qfgl_ext_h_
|
#ifndef __qfgl_ext_h_
|
||||||
#define __qfgl_ext_h_
|
#define __qfgl_ext_h_
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
# include "config.h"
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_WINDOWS_H
|
|
||||||
# include <windows.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "QF/qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
#include "QF/GL/defines.h"
|
#include "QF/GL/defines.h"
|
||||||
#include "QF/GL/types.h"
|
#include "QF/GL/types.h"
|
||||||
|
|
|
@ -29,14 +29,6 @@
|
||||||
#ifndef __QF_GL_rlight_h
|
#ifndef __QF_GL_rlight_h
|
||||||
#define __QF_GL_rlight_h
|
#define __QF_GL_rlight_h
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
# include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_WINDOWS_H
|
|
||||||
# include <windows.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
extern float bubble_sintable[], bubble_costable[];
|
extern float bubble_sintable[], bubble_costable[];
|
||||||
void AddLightBlend (float, float, float, float);
|
void AddLightBlend (float, float, float, float);
|
||||||
void R_RenderDlights (void);
|
void R_RenderDlights (void);
|
||||||
|
|
|
@ -29,14 +29,6 @@
|
||||||
#ifndef __QF_GL_rmain_h
|
#ifndef __QF_GL_rmain_h
|
||||||
#define __QF_GL_rmain_h
|
#define __QF_GL_rmain_h
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
# include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_WINDOWS_H
|
|
||||||
# include <windows.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "QF/qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
|
|
||||||
extern qboolean envmap;
|
extern qboolean envmap;
|
||||||
|
|
|
@ -29,14 +29,6 @@
|
||||||
#ifndef __QF_GL_rsurf_h
|
#ifndef __QF_GL_rsurf_h
|
||||||
#define __QF_GL_rsurf_h
|
#define __QF_GL_rsurf_h
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
# include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_WINDOWS_H
|
|
||||||
# include <windows.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
extern int skytexturenum; // index in cl.loadmodel, not gl texture object
|
extern int skytexturenum; // index in cl.loadmodel, not gl texture object
|
||||||
extern int mirrortexturenum; // quake texturenum, not gltexturenum
|
extern int mirrortexturenum; // quake texturenum, not gltexturenum
|
||||||
|
|
||||||
|
|
|
@ -29,14 +29,6 @@
|
||||||
#ifndef __QF_GL_screen_h
|
#ifndef __QF_GL_screen_h
|
||||||
#define __QF_GL_screen_h
|
#define __QF_GL_screen_h
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
# include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_WINDOWS_H
|
|
||||||
# include <windows.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
extern int glx, gly, glwidth, glheight;
|
extern int glx, gly, glwidth, glheight;
|
||||||
|
|
||||||
#endif // __QF_GL_screen_h
|
#endif // __QF_GL_screen_h
|
||||||
|
|
|
@ -29,14 +29,6 @@
|
||||||
#ifndef __QF_GL_sky_h
|
#ifndef __QF_GL_sky_h
|
||||||
#define __QF_GL_sky_h
|
#define __QF_GL_sky_h
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
# include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_WINDOWS_H
|
|
||||||
# include <windows.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "QF/qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
#include "QF/model.h"
|
#include "QF/model.h"
|
||||||
|
|
||||||
|
|
|
@ -29,14 +29,6 @@
|
||||||
#ifndef __gl_textures_h
|
#ifndef __gl_textures_h
|
||||||
#define __gl_textures_h
|
#define __gl_textures_h
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
# include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_WINDOWS_H
|
|
||||||
# include <windows.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "QF/qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
|
|
||||||
#define MAX_GLTEXTURES 2048
|
#define MAX_GLTEXTURES 2048
|
||||||
|
|
|
@ -29,14 +29,6 @@
|
||||||
#ifndef __QF_GL_vid_h
|
#ifndef __QF_GL_vid_h
|
||||||
#define __QF_GL_vid_h
|
#define __QF_GL_vid_h
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
# include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_WINDOWS_H
|
|
||||||
# include <windows.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "QF/qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
#include "QF/GL/types.h"
|
#include "QF/GL/types.h"
|
||||||
#include "QF/GL/extensions.h"
|
#include "QF/GL/extensions.h"
|
||||||
|
|
|
@ -29,14 +29,6 @@
|
||||||
#ifndef __gl_types_h
|
#ifndef __gl_types_h
|
||||||
#define __gl_types_h
|
#define __gl_types_h
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
# include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_WINDOWS_H
|
|
||||||
# include <windows.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "QF/qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
|
|
||||||
typedef unsigned int GLenum;
|
typedef unsigned int GLenum;
|
||||||
|
|
|
@ -31,6 +31,10 @@ static const char rcsid[] =
|
||||||
# include "config.h"
|
# include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_WINDOWS_H
|
||||||
|
# include <windows.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_DLFCN_H
|
#ifdef HAVE_DLFCN_H
|
||||||
#include <dlfcn.h>
|
#include <dlfcn.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue