diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-09-09 02:42:23 +0200 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-09-09 02:42:23 +0200 |
| commit | 609d2be2633d4c73dde01fd55d7e67015d602499 (patch) | |
| tree | d2cd321f7db04cb023dbf4abc4edd10cb8ff79bd | |
| parent | ad9ba099aeef6b27cd0843761fa15ebfa3061bf0 (diff) | |
| parent | 201a236d62fdb6a4ba7996750506ed35ec68b54b (diff) | |
| download | mana-client-609d2be2633d4c73dde01fd55d7e67015d602499.tar.gz mana-client-609d2be2633d4c73dde01fd55d7e67015d602499.tar.bz2 mana-client-609d2be2633d4c73dde01fd55d7e67015d602499.tar.xz mana-client-609d2be2633d4c73dde01fd55d7e67015d602499.zip | |
Merge github.com:mana/mana
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/compoundsprite.cpp | 3 | ||||
| -rw-r--r-- | src/openglgraphics.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 00c9f88b..f4f50eff 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -667,6 +667,7 @@ TARGET_LINK_LIBRARIES(mana ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES} ${GUICHAN_LIBRARIES} + ${X11_LIBRARIES} ${OPENGL_LIBRARIES} ${LIBINTL_LIBRARIES} ${EXTRA_LIBRARIES}) diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp index 6e8af72e..6c413c14 100644 --- a/src/compoundsprite.cpp +++ b/src/compoundsprite.cpp @@ -292,6 +292,7 @@ static void updateValues(int &dimension, int &pos, int imgDimUL, int imgDimRD, i void CompoundSprite::redraw() const { +#ifdef USE_OPENGL // TODO OpenGL support if (Image::getLoadAsOpenGL()) { @@ -302,7 +303,7 @@ void CompoundSprite::redraw() const mNeedsRedraw = false; return; } - +#endif mWidth = mHeight = mOffsetX = mOffsetY = 0; Sprite *s = NULL; diff --git a/src/openglgraphics.h b/src/openglgraphics.h index 23638eec..16448a79 100644 --- a/src/openglgraphics.h +++ b/src/openglgraphics.h @@ -28,7 +28,6 @@ #define NO_SDL_GLEXT #include <SDL_opengl.h> -#endif class OpenGLGraphics : public Graphics { @@ -127,5 +126,6 @@ class OpenGLGraphics : public Graphics bool mColorAlpha; bool mSync; }; +#endif //USE_OPENGL #endif |