Browse Source

better freetype controls

David Rose 24 years ago
parent
commit
0eb1e35c05
2 changed files with 13 additions and 0 deletions
  1. 8 0
      dtool/Config.pp
  2. 5 0
      dtool/Package.pp

+ 8 - 0
dtool/Config.pp

@@ -322,8 +322,16 @@
 
 // Do we have Freetype 2.0 (or better)?  If available, this package is
 // used to generate dynamic in-the-world text from font files.
+
+// On Unix, freetype comes with the freetype-config executable, which
+// tells us where to look for the various files.  On Windows, we need to
+// supply this information explicitly.
 #define FREETYPE_CONFIG freetype-config
 #defer HAVE_FREETYPE $[bintest $[FREETYPE_CONFIG]]
+#define FREETYPE_CFLAGS
+#define FREETYPE_IPATH
+#define FREETYPE_LPATH
+#define FREETYPE_LIBS
 
 // Is Maya installed?  This matters only to programs in PANDATOOL.
 #define MAYA_LOCATION /usr/aw/maya3.0

+ 5 - 0
dtool/Package.pp

@@ -163,6 +163,11 @@
 
 #set FREETYPE_CONFIG $[FREETYPE_CONFIG]
 #set HAVE_FREETYPE $[HAVE_FREETYPE]
+#set FREETYPE_CFLAGS $[FREETYPE_CFLAGS]
+#set FREETYPE_IPATH $[FREETYPE_IPATH]
+#set FREETYPE_LPATH $[FREETYPE_LPATH]
+#set FREETYPE_LIBS $[FREETYPE_LIBS]
+
 
 #set MAYA_LOCATION $[MAYA_LOCATION]
 #set HAVE_MAYA $[HAVE_MAYA]