d3d0859b4c
disable pragmas that turn off specific warnings for MSVC. Unfortunately it's presence is only checked in osg/Export header, making other Export headers disable warnings no matter what, which is kind of incoherent. My fix adds #include <osg/Config> to every Export header. I've also unified checking whether to disable warnings to current osg/Export way: #if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS). Attachment contains all changed Export files in their original locations."
50 lines
1.6 KiB
C++
50 lines
1.6 KiB
C++
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 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.
|
|
*/
|
|
|
|
#ifndef OSGVOLUME_EXPORT_
|
|
#define OSGVOLUME_EXPORT_ 1
|
|
|
|
#include<osg/Config>
|
|
|
|
#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
|
|
#pragma warning( disable : 4244 )
|
|
#pragma warning( disable : 4251 )
|
|
#pragma warning( disable : 4267 )
|
|
#pragma warning( disable : 4275 )
|
|
#pragma warning( disable : 4290 )
|
|
#pragma warning( disable : 4786 )
|
|
#pragma warning( disable : 4305 )
|
|
#pragma warning( disable : 4996 )
|
|
#endif
|
|
|
|
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__)
|
|
# if defined( OSG_LIBRARY_STATIC )
|
|
# define OSGVOLUME_EXPORT
|
|
# elif defined( OSGVOLUME_LIBRARY )
|
|
# define OSGVOLUME_EXPORT __declspec(dllexport)
|
|
# else
|
|
# define OSGVOLUME_EXPORT __declspec(dllimport)
|
|
# endif
|
|
#else
|
|
# define OSGVOLUME_EXPORT
|
|
#endif
|
|
|
|
/**
|
|
|
|
\namespace osgVolume
|
|
|
|
The osgVolume library is a NodeKit that extends the core scene graph to support volume rendering.
|
|
*/
|
|
|
|
#endif
|