Include `freetype.hh' where appropriate.

This ensures that we aren't dependent on indirect header inclusion chains of
third-party packages.

diff --git a/lily/include/freetype.hh b/lily/include/freetype.hh
index 14f14d92c0317248e97f12c221bfc69d985a31e5..89104bc8880a19b7ad32fb9ba8b166ece8fe85b5 100644 (file)
--- a/lily/include/freetype.hh
+++ b/lily/include/freetype.hh
@@ -20,6 +20,7 @@
 #ifndef FREETYPE_HH
 #define FREETYPE_HH
 
+// This include file loads the header file macros for FreeType.
 #include <ft2build.h>
 #include FT_FREETYPE_H
 

diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index 837a1f23001772aebe5bec7271c2084b80e82ca4..76bbff86ed0cfdb762a70d3da57bdd9c4647f459 100644 (file)
--- a/lily/open-type-font.cc
+++ b/lily/open-type-font.cc
@@ -18,6 +18,7 @@
 */
 
 #include "open-type-font.hh"
+#include "freetype.hh"
 
 #include <cstdio>
 

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index b148a5bc08cf52b98849d2c71663859a254813cc..e7b5489df53b7d7963ef519271ded85da2e50d8f 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -22,6 +22,7 @@
 #define PANGO_ENABLE_BACKEND
 
 #include <pango/pangoft2.h>
+#include "freetype.hh"
 #include FT_XFREE86_H
 
 #include <map>