Changeset 10611 for OpenSceneGraph/trunk/src/osg/State.cpp

Timestamp:

10/07/09 21:42:32 (4 years ago)

Author:

robert

Message:

Introduced optional build against the GLU library, using optional compile paths to enable/disable GLU related function.

To toggle the use of the GLU library adjust the OSG_GLU_AVAILABLE variable via ccmake . or CMakeSetup.

Files:

• OpenSceneGraph/trunk/src/osg/State.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osg/State.cpp

@@ -983 +983 @@
     if (errorNo!=GL_NO_ERROR)
     {
+#ifdef OSG_GLU_AVAILABLE
         const char* error = (char*)gluErrorString(errorNo);
         if (error) osg::notify(WARN)<<"Warning: detected OpenGL error '" << error<<"'";
         else       osg::notify(WARN)<<"Warning: detected OpenGL error number 0x" << std::hex << errorNo << std::dec;
-
+#else
+        osg::notify(WARN)<<"Warning: detected OpenGL error number 0x" << std::hex << errorNo << std::dec;
+#endif
         if (str) osg::notify(WARN)<<" at "<<str<< std::endl;
         else     osg::notify(WARN)<<" in osg::State."<< std::endl;
@@ -1000 +1003 @@
     if (errorNo!=GL_NO_ERROR)
     {
+#ifdef OSG_GLU_AVAILABLE
         const char* error = (char*)gluErrorString(errorNo);
         if (error) osg::notify(WARN)<<"Warning: detected OpenGL error '"<< error <<"' after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
         else       osg::notify(WARN)<<"Warning: detected OpenGL error number 0x"<< std::hex << errorNo <<" after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
-
+#else
+        osg::notify(WARN)<<"Warning: detected OpenGL error number 0x"<< std::hex << errorNo <<" after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
+#endif
         return true;
     }
@@ -1014 +1020 @@
     if (errorNo!=GL_NO_ERROR)
     {
+#ifdef OSG_GLU_AVAILABLE
         const char* error = (char*)gluErrorString(errorNo);
         if (error) osg::notify(WARN)<<"Warning: detected OpenGL error '"<< error <<"' after applying attribute "<<attribute->className()<<" "<<attribute<< std::endl;
         else       osg::notify(WARN)<<"Warning: detected OpenGL error number 0x"<< std::hex << errorNo <<" after applying attribute "<<attribute->className()<<" "<<attribute<< std::dec << std::endl;
+#else
+        osg::notify(WARN)<<"Warning: detected OpenGL error number 0x"<< std::hex << errorNo <<" after applying attribute "<<attribute->className()<<" "<<attribute<< std::dec << std::endl;
+#endif
 
         return true;