* remove unused libvorbisenc from FindOggVorbis and link path

[supertux.git] / src / video / texture_manager.hpp

diff --git a/src/video/texture_manager.hpp b/src/video/texture_manager.hpp
index 32280f4..1431c68 100644 (file)
--- a/src/video/texture_manager.hpp
+++ b/src/video/texture_manager.hpp
@@ -20,14 +20,16 @@
 #ifndef __IMAGE_TEXTURE_MANAGER_HPP__
 #define __IMAGE_TEXTURE_MANAGER_HPP__
 
-#include <GL/gl.h>
+#include <config.h>
+
+#include "glutil.hpp"
 #include <string>
 #include <vector>
 #include <map>
 #include <set>
 
 class Texture;
-class ImageTexture;
+namespace GL { class Texture; }
 
 class TextureManager
 {
@@ -35,33 +37,36 @@ public:
   TextureManager();
   ~TextureManager();
 
-  ImageTexture* get(const std::string& filename);
-  
-  void register_texture(Texture* texture);
-  void remove_texture(Texture* texture);
+  Texture* get(const std::string& filename);
+
+#ifdef HAVE_OPENGL
+  void register_texture(GL::Texture* texture);
+  void remove_texture(GL::Texture* texture);
 
   void save_textures();
   void reload_textures();
+#endif
 
 private:
-  friend class ImageTexture;
-  void release(ImageTexture* texture);
-  
-  typedef std::map<std::string, ImageTexture*> ImageTextures;
+  friend class Texture;
+  void release(Texture* texture);
+
+  typedef std::map<std::string, Texture*> ImageTextures;
   ImageTextures image_textures;
 
-  ImageTexture* create_image_texture(const std::string& filename);
+  Texture* create_image_texture(const std::string& filename);
 
-  typedef std::set<Texture*> Textures;
+#ifdef HAVE_OPENGL
+  typedef std::set<GL::Texture*> Textures;
   Textures textures;
 
   struct SavedTexture
   {
-    Texture* texture;
+    GL::Texture* texture;
     GLint width;
     GLint height;
     char* pixels;
-    GLint border;                              
+    GLint border;
 
     GLint min_filter;
     GLint mag_filter;
@@ -70,10 +75,10 @@ private:
   };
   std::vector<SavedTexture> saved_textures;
 
-  void save_texture(Texture* texture);
+  void save_texture(GL::Texture* texture);
+#endif
 };
 
 extern TextureManager* texture_manager;
 
 #endif
-