From 196cc38da19b867eaa9419343dd6ecd8212af354 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 8 Oct 2012 19:48:26 +0300
Subject: Fix compilation errors and warnings in different modes.

---
 src/resources/openglimagehelper.h | 4 ++--
 src/resources/resourcemanager.cpp | 2 ++
 src/resources/resourcemanager.h   | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/resources')

diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h
index e1a6d48cc..e5c0cab5e 100644
--- a/src/resources/openglimagehelper.h
+++ b/src/resources/openglimagehelper.h
@@ -26,16 +26,15 @@
 #include "localconsts.h"
 #include "main.h"
 
+#ifdef USE_OPENGL
 #include "utils/stringvector.h"
 
 #include "resources/imagehelper.h"
 
 #include <SDL.h>
 
-#ifdef USE_OPENGL
 #define GL_GLEXT_PROTOTYPES 1
 #include <SDL_opengl.h>
-#endif
 
 class Dye;
 class Image;
@@ -125,3 +124,4 @@ class OpenGLImageHelper final : public ImageHelper
 };
 
 #endif
+#endif
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index f67bbf71b..3c5e35738 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -720,6 +720,7 @@ Image *ResourceManager::getSubImage(Image *const parent,
     return static_cast<Image*>(get(ss.str(), SubImageLoader::load, &rl));
 }
 
+#ifdef USE_OPENGL
 struct AtlasLoader
 {
     const std::string name;
@@ -745,6 +746,7 @@ Resource *ResourceManager::getAtlas(const std::string &name,
 
     return get("atlas_" + name, AtlasLoader::load, &rl);
 }
+#endif
 
 struct SpriteDefLoader
 {
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index 6f8b386f0..80461ce19 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -212,7 +212,9 @@ class ResourceManager final
         Image *getSubImage(Image *const parent, const int x, const int y,
                            const int width, const int height);
 
+#ifdef USE_OPENGL
         Resource *getAtlas(const std::string &name, const StringVect &files);
+#endif
 
         /**
          * Creates a sprite definition based on a given path and the supplied
-- 
cgit v1.2.3-70-g09d2