TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix build without freetype

Browse Source
This commit is contained in:
David Rose 2009-01-27 20:19:29 +00:00
parent ad6ee13bb0
commit 5e18148ee3
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
panda/src/text/geomTextGlyph.h
View File

@ -16,10 +16,10 @@
#define GEOMTEXTGLYPH_H #define GEOMTEXTGLYPH_H
#include "pandabase.h" #include "pandabase.h"
#include "geom.h"
#ifdef HAVE_FREETYPE #ifdef HAVE_FREETYPE
#include "geom.h"
#include "dynamicTextGlyph.h" #include "dynamicTextGlyph.h"
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -77,6 +77,11 @@ private:
#include "geomTextGlyph.I" #include "geomTextGlyph.I"
#else // HAVE_FREETYPE
// Without Freetype, a GeomTextGlyph is really just an ordinary Geom.
typedef Geom GeomTextGlyph;
#endif // HAVE_FREETYPE #endif // HAVE_FREETYPE
#endif // GEOMTEXTGLYPH_H #endif // GEOMTEXTGLYPH_H

2
panda/src/text/textAssembler.I
View File

@ -558,5 +558,7 @@ operator < (const TextAssembler::GeomCollectorKey &other) const {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE void TextAssembler::GeomCollector:: INLINE void TextAssembler::GeomCollector::
count_geom(const Geom *geom) { count_geom(const Geom *geom) {
#ifdef HAVE_FREETYPE
_geom->count_geom(geom); _geom->count_geom(geom);
#endif
} }