From Norman Vine, fixes for Mingw

This commit is contained in:
Robert Osfield
2004-08-02 09:11:31 +00:00
parent e122b34858
commit 6524fe1293
25 changed files with 113 additions and 14 deletions

View File

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

View File

@@ -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)

View File

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

View File

@@ -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()
{
}

View File

@@ -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

View File

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

View File

@@ -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()
{
}

View File

@@ -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;

View File

@@ -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

View File

@@ -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

View File

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

View File

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

View File

@@ -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

View File

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

View File

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

View File

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