diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-08-13 11:36:36 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-08-13 11:36:36 +0000 |
| commit | afc770043be553998555e9ac1cffca68dc482d48 (patch) | |
| tree | 60e99ade9464b0a1de2ec246724a7bfe0957eec4 /src/resources/openglsdlimageloader.cpp | |
| parent | cfcc1bc3a756185bd39dd858ebbe69b5916ac11b (diff) | |
| download | mana-client-afc770043be553998555e9ac1cffca68dc482d48.tar.gz mana-client-afc770043be553998555e9ac1cffca68dc482d48.tar.bz2 mana-client-afc770043be553998555e9ac1cffca68dc482d48.tar.xz mana-client-afc770043be553998555e9ac1cffca68dc482d48.zip | |
Merged cleanups and content changes from the trunk. Also fixed compiling with
OpenGL enabled.
Diffstat (limited to 'src/resources/openglsdlimageloader.cpp')
| -rw-r--r-- | src/resources/openglsdlimageloader.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/resources/openglsdlimageloader.cpp b/src/resources/openglsdlimageloader.cpp index c7ddec74..b3e1601e 100644 --- a/src/resources/openglsdlimageloader.cpp +++ b/src/resources/openglsdlimageloader.cpp @@ -21,14 +21,16 @@ * $Id: sdlimageloader.cpp 2121 2006-01-31 02:55:26Z der_doener $ */ -#ifdef USE_OPENGL - #include "openglsdlimageloader.h" #include <string> #include "resourcemanager.h" +#include "../main.h" + +#ifdef USE_OPENGL + SDL_Surface* OpenGLSDLImageLoader::loadSDLSurface(const std::string& filename) { ResourceManager *resman = ResourceManager::getInstance(); |