summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-04-08 10:10:09 +0200
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-04-08 10:10:09 +0200
commit893b27069504c37f631ca76eae4df268e40c7b2c (patch)
treec7d973cb6e86374831f4b2576615dae12a91da38
parentecb099225b673549179027af0d430bd9b1cfe99d (diff)
downloadmana-893b27069504c37f631ca76eae4df268e40c7b2c.tar.gz
mana-893b27069504c37f631ca76eae4df268e40c7b2c.tar.bz2
mana-893b27069504c37f631ca76eae4df268e40c7b2c.tar.xz
mana-893b27069504c37f631ca76eae4df268e40c7b2c.zip
CMake: We actually no longer depend on Guichan OpenGL
-rw-r--r--src/CMakeLists.txt3
-rw-r--r--src/gui/widgets/textbox.cpp2
2 files changed, 1 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7bce856b..a5b33412 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,9 +17,6 @@ SET(FLAGS_EA "${FLAGS} -DEATHENA_SUPPORT")
SET(FLAGS_TMW "${FLAGS} -DTMWSERV_SUPPORT")
SET(GUICHAN_COMPONENTS "SDL")
-IF (WITH_OPENGL)
- SET(GUICHAN_COMPONENTS ${GUICHAN_COMPONENTS} "OpenGL")
-ENDIF (WITH_OPENGL)
FIND_PACKAGE(Guichan REQUIRED ${GUICHAN_COMPONENTS})
IF (WITH_OPENGL)
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index bf3692ec..4c463078 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -28,7 +28,7 @@
#include <sstream>
TextBox::TextBox() :
- gcn::TextBox(), mTextColor(&guiPalette->getColor(Palette::TEXT))
+ gcn::TextBox(), mTextColor(&guiPalette->getColor(Palette::TEXT))
{
setOpaque(false);
setFrameSize(0);