- fixed freetype-gl on windows compiler

- deprecated ancient opengl extension code and replaced it with glew
- testing new font renderer on windows (still in progress need to fix newlines)
(now need to check the Linux build and possibly make adjustments)
This commit is contained in:
Mark Vejvoda
2011-11-18 08:28:42 +00:00
parent 0e9b4851fd
commit d0acde5d88
18 changed files with 111 additions and 35 deletions

View File

@@ -37,8 +37,14 @@
#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

View File

@@ -12,6 +12,7 @@
#ifndef _SHARED_GRAPHICS_GL_OPENGL_H_
#define _SHARED_GRAPHICS_GL_OPENGL_H_
#include <GL/glew.h>
#include <cassert>
#include <stdexcept>
#include <string>

View File

@@ -33,7 +33,7 @@
#include <GL/gl.h>
#include "Mathlib.h"
#include "Texture.h"
#include "md5Texture.h"
namespace Shared { namespace Graphics { namespace md5 {

View File

@@ -18,7 +18,7 @@
#define __TEXTUREMANAGER_H__
#include "DataManager.h"
#include "Texture.h"
#include "md5Texture.h"
namespace Shared { namespace Graphics { namespace md5 {