From ea9f93442a3e073b47ead4d98076f2fb6e3dcb33 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 26 Mar 2011 18:51:06 +0200 Subject: Fix complilation without opengl. --- src/graphicsvertexes.h | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src/graphicsvertexes.h') diff --git a/src/graphicsvertexes.h b/src/graphicsvertexes.h index 1efb74f01..2ab54197d 100644 --- a/src/graphicsvertexes.h +++ b/src/graphicsvertexes.h @@ -55,7 +55,7 @@ class SDLGraphicsVertexes std::list mList; }; - +#ifdef USE_OPENGL class OpenGL1GraphicsVertexes { }; @@ -73,10 +73,6 @@ class OpenGLGraphicsVertexes GLint *switchIntTexArray(); - void init(); - - void clear(); - std::vector &getFloatTexPool() { return mFloatTexPool; } @@ -91,6 +87,10 @@ class OpenGLGraphicsVertexes std::vector &getVp() { return mVp; } + void init(); + + void clear(); + private: GLfloat *mFloatTexArray; GLint *mIntTexArray; @@ -100,6 +100,7 @@ class OpenGLGraphicsVertexes std::vector mIntTexPool; std::vector mVp; }; +#endif class GraphicsVertexes { @@ -112,9 +113,11 @@ class GraphicsVertexes SDLGraphicsVertexes sdl[5]; +#ifdef USE_OPENGL OpenGL1GraphicsVertexes ogl1[5]; OpenGLGraphicsVertexes ogl[5]; +#endif void init(int x, int y, int w, int h); @@ -130,8 +133,10 @@ class GraphicsVertexes void setPtr(int num) { mPtr = num; } +#ifdef USE_OPENGL OpenGLGraphicsVertexes* getOGL() { return &ogl[mPtr]; } +#endif int getX() { return mX; } @@ -149,7 +154,9 @@ class GraphicsVertexes int mPtr; private: +#ifdef USE_OPENGL static int mUseOpenGL; +#endif }; #endif // GRAPHICSVERTEXES_H -- cgit v1.2.3-60-g2f50