aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/cmake/00-Common.cmake1
-rw-r--r--linden/indra/llrender/llfont.cpp3
2 files changed, 1 insertions, 3 deletions
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index e15e8a2..8c6ca2d 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -210,7 +210,6 @@ else (STANDALONE)
210 glib-2.0 210 glib-2.0
211 gstreamer-0.10 211 gstreamer-0.10
212 gtk-2.0 212 gtk-2.0
213 llfreetype2
214 pango-1.0 213 pango-1.0
215 ) 214 )
216endif (STANDALONE) 215endif (STANDALONE)
diff --git a/linden/indra/llrender/llfont.cpp b/linden/indra/llrender/llfont.cpp
index d7310bd..2ac7bdb 100644
--- a/linden/indra/llrender/llfont.cpp
+++ b/linden/indra/llrender/llfont.cpp
@@ -37,8 +37,7 @@
37#if !defined(LL_LINUX) || defined(LL_STANDALONE) 37#if !defined(LL_LINUX) || defined(LL_STANDALONE)
38# include <ft2build.h> 38# include <ft2build.h>
39#else 39#else
40// I had to do some work to avoid the system-installed FreeType headers... --ryan. 40# include "ft2build.h"
41# include "llfreetype2/freetype/ft2build.h"
42#endif 41#endif
43 42
44// For some reason, this won't work if it's not wrapped in the ifdef 43// For some reason, this won't work if it's not wrapped in the ifdef