- cleanup of header files related to opengl / glew
This commit is contained in:
parent
cef0577e3e
commit
53e1610234
|
@ -37,17 +37,9 @@
|
||||||
|
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
//#include "gl.h"
|
|
||||||
#include <GL/glew.h>
|
|
||||||
|
|
||||||
//#include <GL/glu.h>
|
|
||||||
//#include "glext.h"
|
|
||||||
//typedef char GLchar; /* native character */
|
|
||||||
//#define GL_BOOL 0x8B56
|
|
||||||
|
|
||||||
#else
|
|
||||||
#include <GL/glu.h>
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <GL/glew.h>
|
||||||
#include "vector.h"
|
#include "vector.h"
|
||||||
|
|
||||||
#define MAX_VERTEX_ATTRIBUTE 64
|
#define MAX_VERTEX_ATTRIBUTE 64
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
//#include <tr1/memory>
|
//#include <tr1/memory>
|
||||||
#include <GL/gl.h>
|
#include <GL/glew.h>
|
||||||
|
|
||||||
#include "Mathlib.h"
|
#include "Mathlib.h"
|
||||||
#include "md5Texture.h"
|
#include "md5Texture.h"
|
||||||
|
|
|
@ -22,10 +22,7 @@
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#endif // _WIN32
|
#endif // _WIN32
|
||||||
|
|
||||||
#include <GL/gl.h>
|
#include <GL/glew.h>
|
||||||
#ifndef _WIN32
|
|
||||||
#include <GL/glext.h>
|
|
||||||
#endif
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
|
@ -16,20 +16,13 @@
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
|
||||||
#include <GL/glew.h>
|
#include <GL/glew.h>
|
||||||
//#include "gl.h"
|
|
||||||
|
|
||||||
//#include <GL/gl.h>
|
|
||||||
//#include <GL/glu.h>
|
|
||||||
//#include <glprocs.h>
|
|
||||||
|
|
||||||
#define GLEST_GLPROC(X, Y) inline X( static a= wglGetProcAddress(a); return a;)
|
#define GLEST_GLPROC(X, Y) inline X( static a= wglGetProcAddress(a); return a;)
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#include <GL/glew.h>
|
#include <GL/glew.h>
|
||||||
#include <SDL.h>
|
|
||||||
#define GL_GLEXT_PROTOTYPES
|
#define GL_GLEXT_PROTOTYPES
|
||||||
//#include <SDL_opengl.h>
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
|
|
||||||
#include <SDL.h>
|
#include <SDL.h>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
//#include "gl.h"
|
|
||||||
#include <GL/glew.h>
|
#include <GL/glew.h>
|
||||||
#include "leak_dumper.h"
|
#include "leak_dumper.h"
|
||||||
|
|
||||||
|
|
|
@ -30,23 +30,12 @@
|
||||||
* those of the authors and should not be interpreted as representing official
|
* those of the authors and should not be interpreted as representing official
|
||||||
* policies, either expressed or implied, of Nicolas P. Rougier.
|
* policies, either expressed or implied, of Nicolas P. Rougier.
|
||||||
* ========================================================================= */
|
* ========================================================================= */
|
||||||
#if defined(__APPLE__)
|
|
||||||
//#include <Glut/glut.h>
|
|
||||||
#else
|
|
||||||
//#include <GL/glut.h>
|
|
||||||
#endif
|
|
||||||
//#include <stdlib.h>
|
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//#include "gl.h"
|
|
||||||
#include <GL/glew.h>
|
#include <GL/glew.h>
|
||||||
|
|
||||||
//#include <GL/gl.h>
|
|
||||||
//#include <GL/glu.h>
|
|
||||||
//#include <glprocs.h>
|
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
|
@ -34,7 +34,6 @@
|
||||||
#include FT_FREETYPE_H
|
#include FT_FREETYPE_H
|
||||||
// #include FT_ADVANCES_H
|
// #include FT_ADVANCES_H
|
||||||
#include FT_LCD_FILTER_H
|
#include FT_LCD_FILTER_H
|
||||||
//#include <stdint.h>
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
|
@ -34,13 +34,9 @@
|
||||||
|
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <GL/glew.h>
|
|
||||||
//#include "gl.h"
|
|
||||||
|
|
||||||
#else
|
|
||||||
#include <GL/glu.h>
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <GL/glew.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "texture-font.h"
|
#include "texture-font.h"
|
||||||
|
|
|
@ -36,8 +36,6 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include "vector.h"
|
#include "vector.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
Vector *
|
Vector *
|
||||||
vector_new( size_t item_size )
|
vector_new( size_t item_size )
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
#include "font_text_freetypegl.h"
|
#include "font_text_freetypegl.h"
|
||||||
#include "vector.h"
|
#include "vector.h"
|
||||||
|
|
||||||
//#include "opengl.h"
|
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
|
@ -32,10 +31,6 @@ using namespace Shared::PlatformCommon;
|
||||||
|
|
||||||
namespace Shared { namespace Graphics { namespace Gl {
|
namespace Shared { namespace Graphics { namespace Gl {
|
||||||
|
|
||||||
|
|
||||||
//string TextFreetypeGL::langHeightText = "yW";
|
|
||||||
//int TextFreetypeGL::faceResolution = 72;
|
|
||||||
|
|
||||||
//====================================================================
|
//====================================================================
|
||||||
TextFreetypeGL::TextFreetypeGL(FontTextHandlerType type) : Text(type) {
|
TextFreetypeGL::TextFreetypeGL(FontTextHandlerType type) : Text(type) {
|
||||||
buffer=NULL;
|
buffer=NULL;
|
||||||
|
|
|
@ -20,13 +20,9 @@
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#endif // _WIN32
|
#endif // _WIN32
|
||||||
|
|
||||||
//#include "gl.h"
|
|
||||||
#include <GL/glew.h>
|
#include <GL/glew.h>
|
||||||
|
|
||||||
//#include <GL/gl.h>
|
|
||||||
//#include <GL/glu.h>
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
#include "GlErrors.h"
|
#include "GlErrors.h"
|
||||||
|
|
||||||
namespace Shared { namespace Graphics { namespace md5 {
|
namespace Shared { namespace Graphics { namespace md5 {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user