summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2011-09-07 23:09:28 -0700
committerBen Longbons <b.r.longbons@gmail.com>2011-09-07 23:09:28 -0700
commit8fe9c1d9f046aa6d746ab075b3056d75898d1f2c (patch)
tree3ad4a178d385cd6cdf2b7bddc920109ca0bf9aed
parentb9bf0acfe46222508c9910c2a2b750feafb5a0d2 (diff)
downloadmana-8fe9c1d9f046aa6d746ab075b3056d75898d1f2c.tar.gz
mana-8fe9c1d9f046aa6d746ab075b3056d75898d1f2c.tar.bz2
mana-8fe9c1d9f046aa6d746ab075b3056d75898d1f2c.tar.xz
mana-8fe9c1d9f046aa6d746ab075b3056d75898d1f2c.zip
Changes need to build without OpenGL
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/openglgraphics.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 35af94fb..7b64d404 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -649,6 +649,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 ee96e19c..73adbdc1 100644
--- a/src/openglgraphics.h
+++ b/src/openglgraphics.h
@@ -30,7 +30,6 @@
#define NO_SDL_GLEXT
#include <SDL_opengl.h>
-#endif
class OpenGLGraphics : public Graphics
{
@@ -129,5 +128,6 @@ class OpenGLGraphics : public Graphics
bool mColorAlpha;
bool mSync;
};
+#endif //USE_OPENGL
#endif