From d15d76976b6e57a9f421ab034c6f841051b962f3 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Wed, 27 Jul 2005 21:55:20 +0000
Subject: Committing merging opengl and sdl part 3 by Andrej

---
 src/graphics.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/graphics.h')

diff --git a/src/graphics.h b/src/graphics.h
index a66bb2da..461bb45c 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -26,8 +26,10 @@
 
 #include <guichan/sdl.hpp>
 #include <SDL.h>
+#ifdef USE_OPENGL
 #include <guichan/opengl.hpp>
 #include <SDL_opengl.h>
+#endif
 #include <guichan/imagefont.hpp>
 #include <guichan/rectangle.hpp>
 #include "resources/image.h"
@@ -56,7 +58,11 @@ struct ImageRect {
 /**
  * A central point of control for graphics.
  */
-class Graphics : public gcn::SDLGraphics, public gcn::OpenGLGraphics {
+class Graphics :
+#ifdef USE_OPENGL
+public gcn::OpenGLGraphics,
+#endif
+public gcn::SDLGraphics {
     public:
         /**
          * Constructor.
@@ -100,7 +106,7 @@ class Graphics : public gcn::SDLGraphics, public gcn::OpenGLGraphics {
         /**
          * Returns the width of the screen.
          */
-        virtual int getWidth();
+        int getWidth();
 
         /**
          * Returns the height of the screen.
-- 
cgit v1.2.3-60-g2f50