diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2011-09-08 14:09:28 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2011-09-08 14:09:28 -0700 |
| commit | a7f4baec9399cda6d2c4850b2006d8df4f8448ac (patch) | |
| tree | eccf2bf4201fdfd51c7ffa2dfcc43c9e6b5c8cdc | |
| parent | 8666a98554813434e842cdb15671538c5c2ae6db (diff) | |
| parent | 8fe9c1d9f046aa6d746ab075b3056d75898d1f2c (diff) | |
| download | mana-client-a7f4baec9399cda6d2c4850b2006d8df4f8448ac.tar.gz mana-client-a7f4baec9399cda6d2c4850b2006d8df4f8448ac.tar.bz2 mana-client-a7f4baec9399cda6d2c4850b2006d8df4f8448ac.tar.xz mana-client-a7f4baec9399cda6d2c4850b2006d8df4f8448ac.zip | |
Merge remote-tracking branch 'origin/0.5'
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/openglgraphics.h | 2 |
2 files changed, 2 insertions, 1 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/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 |