Merged in various changes from the OSG-2.8 to being svn/trunk up to date.

This commit is contained in:
Robert Osfield
2009-02-19 14:24:10 +00:00
parent ca2d844c4f
commit 979d1e6be7
11 changed files with 982 additions and 42 deletions

View File

@@ -15,6 +15,7 @@
#define OSGDB_FSTREAM 1
#include <osgDB/Export>
#include <osg/Export>
#include <fstream>

View File

@@ -15,6 +15,7 @@
#ifndef OSGINTROSPECTION_EXPORTHDR
#define OSGINTROSPECTION_EXPORTHDR 1
#include <osg/Config>
#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
#pragma warning( disable : 4251 )

View File

@@ -17,6 +17,7 @@
#define OSGWIDGET_EXPORT_ 1
#if defined(_MSC_VER)
#pragma warning( disable : 4121 )
#pragma warning( disable : 4244 )
#pragma warning( disable : 4251 )
#pragma warning( disable : 4267 )