From Colin McDonald, "Fixes for some duplicate global symbol definitions in the plugins,

which cause errors when creating a statically linked executable."

src/osg/FrameBufferObject.cpp

@@ -403,6 +403,10 @@ void FrameBufferObject::apply(State &state) const
     if (_unsupported[contextID])
         return;
         
+        
+        
+    state.checkGLErrors("A");
+        
     FBOExtensions* ext = FBOExtensions::instance(contextID);
     if (!ext->isSupported())
     {
@@ -417,6 +421,8 @@ void FrameBufferObject::apply(State &state) const
         return;
     }
 
+    state.checkGLErrors("B");
+
     int &dirtyAttachmentList = _dirtyAttachmentList[contextID];
 
     GLuint &fboID = _fboID[contextID];
@@ -433,6 +439,8 @@ void FrameBufferObject::apply(State &state) const
 
     }
 
+    state.checkGLErrors("C");
+
     if (dirtyAttachmentList)
     {
         // create textures and mipmaps before we bind the frame buffer object
@@ -444,8 +452,12 @@ void FrameBufferObject::apply(State &state) const
 
     }
     
+    state.checkGLErrors("D");
+
     ext->glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboID);
 
+    state.checkGLErrors("E");
+
     if (dirtyAttachmentList)
     {
         for (AttachmentMap::const_iterator i=_attachments.begin(); i!=_attachments.end(); ++i)
@@ -455,6 +467,7 @@ void FrameBufferObject::apply(State &state) const
         }        
         dirtyAttachmentList = 0;
     }
+    state.checkGLErrors("F");
 }
 
 int FrameBufferObject::compare(const StateAttribute &sa) const

src/osgPlugins/flt/GroupRecord.cpp

@@ -12,7 +12,7 @@ using namespace flt;
 //
 ////////////////////////////////////////////////////////////////////
 
-RegisterRecordProxy<GroupRecord> g_GroupProxy;
+RegisterRecordProxy<GroupRecord> g_fltGroupProxy;
 
 GroupRecord::GroupRecord()
 {

src/osgPlugins/flt/ObjectRecord.cpp

@@ -12,7 +12,7 @@ using namespace flt;
 //
 ////////////////////////////////////////////////////////////////////
 
-RegisterRecordProxy<ObjectRecord> g_ObjectProxy;
+RegisterRecordProxy<ObjectRecord> g_fltObjectProxy;
 
 ObjectRecord::ObjectRecord()
 {

src/osgPlugins/flt/SwitchRecord.cpp

@@ -12,7 +12,7 @@ using namespace flt;
 //
 ////////////////////////////////////////////////////////////////////
 
-RegisterRecordProxy<SwitchRecord> g_SwitchProxy;
+RegisterRecordProxy<SwitchRecord> g_fltSwitchProxy;
 
 SwitchRecord::SwitchRecord()
 {

src/osgPlugins/osgSim/IO_MultiSwitch.cpp

@@ -13,7 +13,7 @@ bool MultiSwitch_readLocalData(Object& obj, Input& fr);
 bool MultiSwitch_writeLocalData(const Object& obj, Output& fw);
 
 // register the read and write functions with the osgDB::Registry.
-RegisterDotOsgWrapperProxy g_SwitchProxy
+RegisterDotOsgWrapperProxy g_simSwitchProxy
 (
     new osgSim::MultiSwitch,
     "MultiSwitch",

src/osgPlugins/rot/ReaderWriterROT.cpp

@@ -29,7 +29,7 @@
 
 #define EXTENSION_NAME "rot"
 
-bool getFilenameAndParams(const std::string& input, std::string& filename, std::string& params)
+static bool getFilenameAndParams(const std::string& input, std::string& filename, std::string& params)
 {
         // find the start of the params list, accounting for nesting of [] and () brackets,
         // note, we are working backwards.

src/osgPlugins/scale/ReaderWriterSCALE.cpp

@@ -30,7 +30,7 @@
 #define EXTENSION_NAME "scale"
 
 
-bool getFilenameAndParams(const std::string& input, std::string& filename, std::string& params)
+static bool getFilenameAndParams(const std::string& input, std::string& filename, std::string& params)
 {
         // find the start of the params list, accounting for nesting of [] and () brackets,
         // note, we are working backwards.

src/osgPlugins/trans/ReaderWriterTRANS.cpp

@@ -30,7 +30,7 @@
 #define EXTENSION_NAME "trans"
 
 
-bool getFilenameAndParams(const std::string& input, std::string& filename, std::string& params)
+static bool getFilenameAndParams(const std::string& input, std::string& filename, std::string& params)
 {
         // find the start of the params list, accounting for nesting of [] and () brackets,
         // note, we are working backwards.