From fe978ac122b831d74ef8ce1044a3fe798da8738c Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 3 Mar 2003 20:12:18 +0000
Subject: [PATCH] Compile fixes to osgText.

---
 src/osgPlugins/freetype/FreeTypeLibrary.h | 5 +++--
 src/osgText/Makefile                      | 2 +-
 src/osgText/Text.cpp                      | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/osgPlugins/freetype/FreeTypeLibrary.h b/src/osgPlugins/freetype/FreeTypeLibrary.h
index 32b13de44..4e6f2f29d 100644
--- a/src/osgPlugins/freetype/FreeTypeLibrary.h
+++ b/src/osgPlugins/freetype/FreeTypeLibrary.h
@@ -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;
 
diff --git a/src/osgText/Makefile b/src/osgText/Makefile
index 4a3240df1..ca3ef029b 100644
--- a/src/osgText/Makefile
+++ b/src/osgText/Makefile
@@ -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)
diff --git a/src/osgText/Text.cpp b/src/osgText/Text.cpp
index 841890f73..3afb63583 100644
--- a/src/osgText/Text.cpp
+++ b/src/osgText/Text.cpp
@@ -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),