Build fixes for Windows

This commit is contained in:
Robert Osfield 2008-09-01 09:57:35 +00:00
parent bc747b0935
commit 8fec858b49
2 changed files with 6 additions and 2 deletions

View File

@ -16,6 +16,10 @@
#include <osg/Texture> #include <osg/Texture>
#ifndef GL_MAX_3D_TEXTURE_SIZE
#define GL_MAX_3D_TEXTURE_SIZE 0x8073
#endif
namespace osg { namespace osg {
/** Encapsulates OpenGl 2D texture functionality. Doesn't support cube maps, /** Encapsulates OpenGl 2D texture functionality. Doesn't support cube maps,

View File

@ -28,10 +28,10 @@ namespace osgTerrain {
/** Extact the setname and filename from a compound string in the from set:setname:filename". /** 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.*/ * 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 "".*/ /** 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 class OSGTERRAIN_EXPORT Layer : public osg::Object
{ {