summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-18 11:20:42 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-18 11:24:45 +0100
commitd495617bfba570ebabf2ee8edb6f465145dbe9c0 (patch)
tree97871e5c6f1e9738db29aec0d1e0133d22ccb09e /src
parent8bce2757ad5d1618d127efb3805e3eb5b93ffda4 (diff)
downloadMana-d495617bfba570ebabf2ee8edb6f465145dbe9c0.tar.gz
Mana-d495617bfba570ebabf2ee8edb6f465145dbe9c0.tar.bz2
Mana-d495617bfba570ebabf2ee8edb6f465145dbe9c0.tar.xz
Mana-d495617bfba570ebabf2ee8edb6f465145dbe9c0.zip
Fixed a broken Mac include for SDL_ttf
Reviewed-by: trapdoor
Diffstat (limited to 'src')
-rw-r--r--src/gui/truetypefont.h4
-rw-r--r--src/openglgraphics.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h
index de146087..1cf6c2c8 100644
--- a/src/gui/truetypefont.h
+++ b/src/gui/truetypefont.h
@@ -26,8 +26,8 @@
#include <string>
#include <guichan/font.hpp>
-#ifndef __APPLE__
-#include <SDL/SDL_ttf.h>
+#ifdef __APPLE__
+#include <SDL_ttf/SDL_ttf.h>
#else
#include <SDL_ttf.h>
#endif
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index e7e7b204..0ee2bc50 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -26,12 +26,12 @@
#include "resources/image.h"
+#ifdef USE_OPENGL
+
#ifdef __APPLE__
#include <OpenGL/OpenGL.h>
#endif
-#ifdef USE_OPENGL
-
#ifndef GL_TEXTURE_RECTANGLE_ARB
#define GL_TEXTURE_RECTANGLE_ARB 0x84F5
#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8