From Norman Vine, fixes for Mingw

VisualStudio/osgDB/osgDB.dsp

@@ -139,6 +139,10 @@ SOURCE=..\..\Src\osgDB\Output.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Src\osgDB\ReaderWriter.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Src\osgDB\ReadFile.cpp
 # End Source File
 # Begin Source File

VisualStudio/osgGA/osgGA.dsp

@@ -107,6 +107,10 @@ SOURCE=..\..\src\osgGA\FlightManipulator.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\osgGA\GUIEventAdapter.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\osgGA\GUIEventHandler.cpp
 # End Source File
 # Begin Source File

include/osg/ConvexPlanarOccluder

@@ -54,7 +54,7 @@ class SG_EXPORT ConvexPlanarOccluder : public Object
 
     protected:
 
-        ~ConvexPlanarOccluder() {}
+        ~ConvexPlanarOccluder(); // {}
 
         ConvexPlanarPolygon _occluder;
         HoleList _holeList;

include/osg/GLExtensions

@@ -19,7 +19,9 @@
 
 #if defined(WIN32)
     #define WIN32_LEAN_AND_MEAN
-    #define NOMINMAX
+    #ifndef NOMINMAX
+        #define NOMINMAX
+    #endif // NOMINMAX
     #include <windows.h>
 #elif defined(__APPLE__)
     #include <mach-o/dyld.h>

include/osg/Shape

@@ -82,7 +82,7 @@ class SG_EXPORT Shape : public Object
 
     protected:
     
-    	virtual ~Shape() {}
+    	virtual ~Shape();
 };
 
 // forward declartions of Shape types.
@@ -571,7 +571,7 @@ class SG_EXPORT HeightField : public Shape
 
     protected:
     
-    	~HeightField() {}
+    	virtual ~HeightField();
 
     	unsigned int    _columns,_rows;
 

include/osgDB/ReaderWriter

@@ -31,7 +31,7 @@ namespace osgDB {
 class OSGDB_EXPORT ReaderWriter : public osg::Referenced
 {
     public:
-        virtual ~ReaderWriter() {}
+        virtual ~ReaderWriter(); // {}
         virtual const char* className() = 0;
         virtual bool acceptsExtension(const std::string& /*extension*/) { return false; }
 

include/osgGA/GUIEventAdapter

@@ -292,7 +292,7 @@ protected:
         GUIEventAdapter(MouseYOrientation myo=Y_INCREASING_DOWNWARDS):_mouseYOrientation(myo) {}
 
         /** Force users to create on heap, so that multiple referencing is safe.*/
-        virtual ~GUIEventAdapter() {}
+        virtual ~GUIEventAdapter(); // {}
 
         MouseYOrientation _mouseYOrientation;
 

include/osgProducer/OsgCameraGroup

@@ -135,7 +135,7 @@ class OSGPRODUCER_EXPORT OsgCameraGroup : public Producer::CameraGroup
             virtual void operator()( OsgCameraGroup& cg, OsgSceneHandler& sh, const Producer::RenderSurface & rs) = 0;
             
         protected:
-            virtual ~RealizeCallback() {}
+            virtual ~RealizeCallback(); // {}
         };
 
         /** Set the realize callback to use when once the render surfaces are realized.*/

include/osgSim/ScalarBar

@@ -224,7 +224,8 @@ public:
     /** force update the drawables used to render the scalar bar.*/
     void update() { createDrawables(); }
 
-private:
+protected:
+    virtual ~ScalarBar();
 
     int _numColors;
     int _numLabels;

src/osg/ConvexPlanarOccluder.cpp

@@ -13,3 +13,7 @@
 #include <osg/ConvexPlanarOccluder>
 
 using namespace osg;
+
+ConvexPlanarOccluder::~ConvexPlanarOccluder()
+{
+};

src/osg/Shape.cpp

@@ -15,6 +15,15 @@
 
 using namespace osg;
 
+Shape::~Shape()
+{
+}
+
+HeightField::~HeightField()
+{
+}
+
+
 void HeightField::allocate(unsigned int numColumns,unsigned int numRows)
 {
     if (_columns!=numColumns || _rows!=numRows)

src/osgDB/GNUmakefile

@@ -7,6 +7,7 @@ CXXFILES =\
 	FileNameUtils.cpp\
 	FileUtils.cpp\
 	ReadFile.cpp\
+	ReaderWriter.cpp\
 	Registry.cpp\
 	Version.cpp\
 	WriteFile.cpp\

src/osgDB/ReaderWriter.cpp

@@ -0,0 +1,20 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2003 Robert Osfield 
+ *
+ * This library is open source and may be redistributed and/or modified under  
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * OpenSceneGraph Public License for more details.
+*/
+
+#include <osgDB/ReaderWriter>
+
+using namespace osgDB;
+
+ReaderWriter::~ReaderWriter()
+{
+}

src/osgGA/DriveManipulator.cpp

@@ -1,3 +1,16 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2003 Robert Osfield 
+ *
+ * This library is open source and may be redistributed and/or modified under  
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * OpenSceneGraph Public License for more details.
+*/
+
 #if defined(_MSC_VER)
 	#pragma warning( disable : 4786 )
 #endif

src/osgGA/GNUmakefile

@@ -7,6 +7,7 @@ CXXFILES = \
 	MatrixManipulator.cpp\
 	DriveManipulator.cpp\
 	FlightManipulator.cpp\
+        GUIEventAdapter.cpp\
         GUIEventHandler.cpp\
         GUIEventHandlerVisitor.cpp\
         KeySwitchMatrixManipulator.cpp\

src/osgGA/GUIEventAdapter.cpp

@@ -0,0 +1,20 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2003 Robert Osfield 
+ *
+ * This library is open source and may be redistributed and/or modified under  
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * OpenSceneGraph Public License for more details.
+*/
+
+#include <osgGA/GUIEventHandler>
+
+using namespace osgGA;
+
+GUIEventAdapter::~GUIEventAdapter()
+{
+}

src/osgGA/GUIEventHandler.cpp

@@ -1,3 +1,16 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2003 Robert Osfield 
+ *
+ * This library is open source and may be redistributed and/or modified under  
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * OpenSceneGraph Public License for more details.
+*/
+
 #include <osgGA/GUIEventHandler>
 
 using namespace osgGA;

src/osgPlugins/flt/AttrData.h

@@ -1,7 +1,7 @@
 #ifndef __ATTR_DATA_H
 #define __ATTR_DATA_H
 
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_MSC_VER)
 #pragma warning( disable : 4786 )
 #endif
 

src/osgPlugins/flt/GeoSetBuilder.cpp

@@ -4,7 +4,7 @@
 // that is used to detail texture
 // Julian Ortiz, June 18th 2003.
 
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_MSC_VER)
 #pragma warning( disable : 4786 )
 #endif
 

src/osgPlugins/flt/MeshPrimitiveRecord.cpp

@@ -1,6 +1,6 @@
 // MeshPrimitiveRecords.cpp
 
-#ifdef _WIN32
+#if defined(_MSC_VER)
 #pragma warning(disable:4786) // Truncated debug names.
 #endif
 

src/osgPlugins/flt/MeshRecord.cpp

@@ -1,6 +1,6 @@
 // MeshRecord.cpp
 
-#ifdef _WIN32
+#if defined(_MSC_VER)
 #pragma warning(disable:4786) // Truncated debug names.
 #endif
 

src/osgPlugins/flt/Registry.h

@@ -4,7 +4,7 @@
 #ifndef __FLT_REGISTRY_H
 #define __FLT_REGISTRY_H
 
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_MSC_VER)
 #pragma warning( disable : 4786 )
 #endif
 

src/osgPlugins/flt/flt.h

@@ -11,7 +11,7 @@
 #include <iostream>
 #include <assert.h>
 
-#if defined(__CYGWIN__) || defined(__MINGW32__)
+#if defined(_MSC_VER)
 #include <sys/types.h>
 #endif
 

src/osgProducer/OsgCameraGroup.cpp

@@ -26,6 +26,9 @@
 using namespace Producer;
 using namespace osgProducer;
 
+OsgCameraGroup::RealizeCallback::~RealizeCallback()
+{
+}
 
 class RenderSurfaceRealizeCallback : public Producer::RenderSurface::Callback
 {

src/osgSim/ScalarBar.cpp

@@ -5,6 +5,10 @@
 
 using namespace osgSim;
 
+ScalarBar::~ScalarBar()
+{
+}
+
 std::string ScalarBar::ScalarPrinter::printScalar(float scalar)
 {
     std::stringstream ostr;