From 8fec858b493aa2a75baae9c798ea03f4670b8847 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 1 Sep 2008 09:57:35 +0000 Subject: [PATCH] Build fixes for Windows --- include/osg/Texture3D | 4 ++++ include/osgTerrain/Layer | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/osg/Texture3D b/include/osg/Texture3D index f2a248850..70ee4e5f4 100644 --- a/include/osg/Texture3D +++ b/include/osg/Texture3D @@ -16,6 +16,10 @@ #include +#ifndef GL_MAX_3D_TEXTURE_SIZE +#define GL_MAX_3D_TEXTURE_SIZE 0x8073 +#endif + namespace osg { /** Encapsulates OpenGl 2D texture functionality. Doesn't support cube maps, diff --git a/include/osgTerrain/Layer b/include/osgTerrain/Layer index 57a05fd37..152290a91 100644 --- a/include/osgTerrain/Layer +++ b/include/osgTerrain/Layer @@ -28,10 +28,10 @@ namespace osgTerrain { /** Extact the setname and filename from a compound string in the from set:setname:filename". * Returns a setname of "" when non set:setname: entry is present.*/ -void extractSetNameAndFileName(const std::string& compoundstring, std::string& setname, std::string& filename); +extern OSGTERRAIN_EXPORT void extractSetNameAndFileName(const std::string& compoundstring, std::string& setname, std::string& filename); /** Create a compound string in the form set:setname:filename, or just filename if setname is "".*/ -std::string createCompondSetNameAndFileName(const std::string& setname, const std::string& filename); +extern OSGTERRAIN_EXPORT std::string createCompondSetNameAndFileName(const std::string& setname, const std::string& filename); class OSGTERRAIN_EXPORT Layer : public osg::Object {