From Bruce Clay, Build fixes for Win32 VS6.0

This commit is contained in:
Robert Osfield 2004-08-06 05:25:21 +00:00
parent e9f4ed87bc
commit e004dbe58e
3 changed files with 32 additions and 0 deletions

View File

@ -9,6 +9,25 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/ */
#ifdef WIN32
/////////////////////////////////////////////////////////////////////////////
// Disable unavoidable warning messages:
// 4114: same type qualifier used more than once
// 4201: nonstandard extension used : nameless struct/union
// 4237: "keyword" reserved for future use
// 4251: class needs to have dll-interface to export class
// 4275: non DLL-interface class used as base for DLL-interface class
// 4290: C++ Exception Specification ignored
// 4503: ecorated name length exceeded, name was truncated
// 4786: string too long - truncated to 255 characters
//#pragma warning(disable : 4103 4114 4201 4237 4251 4275 4290 4335 4786)
#pragma warning(disable : 4503)
#endif // WIN32
#include <osg/Texture2D> #include <osg/Texture2D>
#include <osg/Geometry> #include <osg/Geometry>
#include <osg/State> #include <osg/State>

View File

@ -92,5 +92,7 @@ int main(int, char *[])
viewer.update(); viewer.update();
viewer.frame(); viewer.frame();
} }
return(0);
} }

View File

@ -11,6 +11,17 @@
* OpenSceneGraph Public License for more details. * OpenSceneGraph Public License for more details.
*/ */
#ifdef WIN32
/////////////////////////////////////////////////////////////////////////////
// Disable unavoidable warning messages:
//
// C4503 - decorated name length exceeded, name was truncated
//
#pragma warning(disable : 4503)
#endif // WIN32
#ifndef DATASET_H #ifndef DATASET_H
#define DATASET_H 1 #define DATASET_H 1