From 1a227bf35e6e1ecac41e3ace131fe10d68af2b92 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 24 Nov 2010 20:20:57 +0000
Subject: [PATCH] From Jean-Sebastien Guay, build fixes for windows.

---
 examples/osgtext3D/TextNode.h |  6 +++---
 src/osgText/GlyphGeometry.cpp | 10 +++++-----
 src/osgText/GlyphGeometry.h   | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/examples/osgtext3D/TextNode.h b/examples/osgtext3D/TextNode.h
index 14bbfe6f6..710cc9a18 100644
--- a/examples/osgtext3D/TextNode.h
+++ b/examples/osgtext3D/TextNode.h
@@ -29,7 +29,7 @@ namespace osgText {
 // forward declare
 class TextNode;
 
-class OSGTEXT_EXPORT Layout : public osg::Object
+class /*OSGTEXT_EXPORT*/ Layout : public osg::Object
 {
     public:
 
@@ -46,7 +46,7 @@ class OSGTEXT_EXPORT Layout : public osg::Object
     protected:
 };
 
-class OSGTEXT_EXPORT TextTechnique : public osg::Object
+class /*OSGTEXT_EXPORT*/ TextTechnique : public osg::Object
 {
     public:
 
@@ -85,7 +85,7 @@ class OSGTEXT_EXPORT TextTechnique : public osg::Object
         TextNode* _textNode;
 };
 
-class OSGTEXT_EXPORT TextNode : public osg::Group
+class /*OSGTEXT_EXPORT*/ TextNode : public osg::Group
 {
     public:
 
diff --git a/src/osgText/GlyphGeometry.cpp b/src/osgText/GlyphGeometry.cpp
index 586b5694e..7dee68d75 100644
--- a/src/osgText/GlyphGeometry.cpp
+++ b/src/osgText/GlyphGeometry.cpp
@@ -455,7 +455,7 @@ struct CollectTriangleIndicesFunctor
 };
 
 
-osg::Geometry* computeGlyphGeometry(const osgText::Glyph3D* glyph, float bevelThickness, float shellThickness)
+OSGTEXT_EXPORT osg::Geometry* computeGlyphGeometry(const osgText::Glyph3D* glyph, float bevelThickness, float shellThickness)
 {
     const osg::Vec3Array* orig_vertices = glyph->getRawVertexArray();
     const osg::Geometry::PrimitiveSetList& orig_primitives = glyph->getRawFacePrimitiveSetList();
@@ -536,7 +536,7 @@ osg::Geometry* computeGlyphGeometry(const osgText::Glyph3D* glyph, float bevelTh
 //
 // computeTextGeometry
 //
-osg::Geometry* computeTextGeometry(const osgText::Glyph3D* glyph, float width)
+OSGTEXT_EXPORT osg::Geometry* computeTextGeometry(const osgText::Glyph3D* glyph, float width)
 {
     const osg::Vec3Array* orig_vertices = glyph->getRawVertexArray();
     const osg::Geometry::PrimitiveSetList& orig_primitives = glyph->getRawFacePrimitiveSetList();
@@ -655,7 +655,7 @@ osg::Geometry* computeTextGeometry(const osgText::Glyph3D* glyph, float width)
 //
 // computeTextGeometry
 //
-osg::Geometry* computeTextGeometry(osg::Geometry* glyphGeometry, const osgText::Bevel& profile, float width)
+OSGTEXT_EXPORT osg::Geometry* computeTextGeometry(osg::Geometry* glyphGeometry, const osgText::Bevel& profile, float width)
 {
     osg::Vec3Array* orig_vertices = dynamic_cast<osg::Vec3Array*>(glyphGeometry->getVertexArray());
     if (!orig_vertices)
@@ -838,7 +838,7 @@ osg::Geometry* computeTextGeometry(osg::Geometry* glyphGeometry, const osgText::
 //
 // computeShellGeometry
 //
-osg::Geometry* computeShellGeometry(osg::Geometry* glyphGeometry, const osgText::Bevel& profile, float width)
+OSGTEXT_EXPORT osg::Geometry* computeShellGeometry(osg::Geometry* glyphGeometry, const osgText::Bevel& profile, float width)
 {
     osg::Vec3Array* orig_vertices = dynamic_cast<osg::Vec3Array*>(glyphGeometry->getVertexArray());
     if (!orig_vertices)
@@ -1061,4 +1061,4 @@ osg::Geometry* computeShellGeometry(osg::Geometry* glyphGeometry, const osgText:
     return text_geometry.release();
 }
 
-}
\ No newline at end of file
+}
diff --git a/src/osgText/GlyphGeometry.h b/src/osgText/GlyphGeometry.h
index 455e42a8d..fb706a43a 100644
--- a/src/osgText/GlyphGeometry.h
+++ b/src/osgText/GlyphGeometry.h
@@ -19,14 +19,14 @@
 namespace osgText
 {
 
-extern osg::Geometry* computeGlyphGeometry(const osgText::Glyph3D* glyph, float bevelThickness, float shellThickness);
+extern OSGTEXT_EXPORT osg::Geometry* computeGlyphGeometry(const osgText::Glyph3D* glyph, float bevelThickness, float shellThickness);
 
-extern osg::Geometry* computeTextGeometry(const osgText::Glyph3D* glyph, float width);
+extern OSGTEXT_EXPORT osg::Geometry* computeTextGeometry(const osgText::Glyph3D* glyph, float width);
 
-extern osg::Geometry* computeTextGeometry(osg::Geometry* glyphGeometry, const Bevel& profile, float width);
+extern OSGTEXT_EXPORT osg::Geometry* computeTextGeometry(osg::Geometry* glyphGeometry, const Bevel& profile, float width);
 
-extern osg::Geometry* computeShellGeometry(osg::Geometry* glyphGeometry, const Bevel& profile, float width);
+extern OSGTEXT_EXPORT osg::Geometry* computeShellGeometry(osg::Geometry* glyphGeometry, const Bevel& profile, float width);
 
 }
 
-#endif
\ No newline at end of file
+#endif