Compile fixes to osgText.
This commit is contained in:
@@ -20,6 +20,9 @@ class FreeTypeLibrary
|
||||
{
|
||||
public:
|
||||
|
||||
/** protected destrcutor to prevent inappropriate deletion.*/
|
||||
virtual ~FreeTypeLibrary();
|
||||
|
||||
/** get the singleton instance.*/
|
||||
static FreeTypeLibrary* instance();
|
||||
|
||||
@@ -31,8 +34,6 @@ protected:
|
||||
* library is via the singleton instance method.*/
|
||||
FreeTypeLibrary();
|
||||
|
||||
/** protected destrcutor to prevent inappropriate deletion.*/
|
||||
virtual ~FreeTypeLibrary();
|
||||
|
||||
FT_Library _ftlibrary;
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ CXXFILES = \
|
||||
|
||||
DEF += -DOSGTEXT_LIBRARY
|
||||
|
||||
LIBS += -losg -losgUtil $(GL_LIBS) $(OTHER_LIBS)
|
||||
LIBS += -losgDB -losgUtil -losg $(GL_LIBS) $(OTHER_LIBS)
|
||||
|
||||
TARGET_BASENAME = osgText
|
||||
LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT)
|
||||
|
||||
@@ -36,7 +36,7 @@ Text::Text():
|
||||
}
|
||||
|
||||
Text::Text(const Text& text,const osg::CopyOp& copyop):
|
||||
Drawable(text,copyop),
|
||||
osg::Drawable(text,copyop),
|
||||
_font(text._font),
|
||||
_fontWidth(text._fontWidth),
|
||||
_fontHeight(text._fontHeight),
|
||||
|
||||
Reference in New Issue
Block a user