- cleanup of header files related to opengl / glew

This commit is contained in:
Mark Vejvoda 2011-11-19 10:13:27 +00:00
parent cef0577e3e
commit 53e1610234
11 changed files with 5 additions and 51 deletions

View File

@ -37,17 +37,9 @@
#define WIN32_LEAN_AND_MEAN
#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
#include <GL/glew.h>
#include "vector.h"
#define MAX_VERTEX_ATTRIBUTE 64

View File

@ -30,7 +30,7 @@
#include <fstream>
#include <stdexcept>
//#include <tr1/memory>
#include <GL/gl.h>
#include <GL/glew.h>
#include "Mathlib.h"
#include "md5Texture.h"

View File

@ -22,10 +22,7 @@
#include <windows.h>
#endif // _WIN32
#include <GL/gl.h>
#ifndef _WIN32
#include <GL/glext.h>
#endif
#include <GL/glew.h>
#include <memory>
#include <stdexcept>
#include <string>

View File

@ -16,20 +16,13 @@
#include <windows.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;)
#else
#include <GL/glew.h>
#include <SDL.h>
#define GL_GLEXT_PROTOTYPES
//#include <SDL_opengl.h>
#endif

View File

@ -13,7 +13,6 @@
#include <SDL.h>
#include <iostream>
//#include "gl.h"
#include <GL/glew.h>
#include "leak_dumper.h"

View File

@ -30,23 +30,12 @@
* those of the authors and should not be interpreted as representing official
* 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
#include <windows.h>
#endif
//#include "gl.h"
#include <GL/glew.h>
//#include <GL/gl.h>
//#include <GL/glu.h>
//#include <glprocs.h>
#include <string.h>
#include <assert.h>

View File

@ -34,7 +34,6 @@
#include FT_FREETYPE_H
// #include FT_ADVANCES_H
#include FT_LCD_FILTER_H
//#include <stdint.h>
#include <stdlib.h>
#include <stdio.h>
#include <assert.h>

View File

@ -34,13 +34,9 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <GL/glew.h>
//#include "gl.h"
#else
#include <GL/glu.h>
#endif
#include <GL/glew.h>
#include <assert.h>
#include <stdlib.h>
#include "texture-font.h"

View File

@ -36,8 +36,6 @@
#include <stdio.h>
#include "vector.h"
/* ------------------------------------------------------------------------- */
Vector *
vector_new( size_t item_size )

View File

@ -14,7 +14,6 @@
#include "font_text_freetypegl.h"
#include "vector.h"
//#include "opengl.h"
#include <stdexcept>
#include <sys/stat.h>
@ -32,10 +31,6 @@ using namespace Shared::PlatformCommon;
namespace Shared { namespace Graphics { namespace Gl {
//string TextFreetypeGL::langHeightText = "yW";
//int TextFreetypeGL::faceResolution = 72;
//====================================================================
TextFreetypeGL::TextFreetypeGL(FontTextHandlerType type) : Text(type) {
buffer=NULL;

View File

@ -20,13 +20,9 @@
#include <windows.h>
#endif // _WIN32
//#include "gl.h"
#include <GL/glew.h>
//#include <GL/gl.h>
//#include <GL/glu.h>
#include <iostream>
#include "GlErrors.h"
namespace Shared { namespace Graphics { namespace md5 {