Add support for Metrowerks Codewarrior build under Windows.

This commit is contained in:
Robert Osfield
2002-02-22 17:12:10 +00:00
parent ddc1212cb4
commit 00e91eec1d
24 changed files with 50 additions and 21 deletions

View File

@@ -1,3 +1,7 @@
#include <osg/GL>
#include <osgGLUT/glut>
#include <osgGLUT/Viewer>
#include <osg/Transform>
#include <osg/Billboard>
#include <osg/Geode>
@@ -11,8 +15,6 @@
#include <osgUtil/FlightManipulator>
#include <osgUtil/DriveManipulator>
#include <osgGLUT/glut>
#include <osgGLUT/Viewer>
#include <osgUtil/Optimizer>
@@ -56,7 +58,7 @@ int main( int argc, char **argv )
if (argc<2)
{
write_usage(osg::notify(osg::NOTICE),argv[0]);
write_usage(std::cout,argv[0]);
return 0;
}

View File

@@ -4,6 +4,8 @@
using namespace osg;
using namespace std;
DisplaySettings::DisplaySettings(const DisplaySettings& vs):Referenced()
{
copy(vs);

View File

@@ -11,6 +11,7 @@
using namespace osg;
using namespace std;
Image::Image()
{

View File

@@ -1,9 +1,7 @@
#include <osg/Notify>
#include <string>
#if defined(__BCPLUSPLUS__)
using std::toupper;
#endif
using namespace std;
osg::NotifySeverity osg::g_NotifyLevel = osg::NOTICE;
std::ofstream *osg::g_NotifyNulStream;

View File

@@ -1,6 +1,7 @@
#include <osgDB/Field>
using namespace osgDB;
using namespace std;
Field::Field()
{

View File

@@ -2,12 +2,14 @@
#if defined(__sgi)
#include <ctype.h>
#elif !defined(WIN32)
#elif !defined(WIN32) || defined(__MWERKS__)
#include <cctype>
using std::tolower;
using std::strlen;
#endif
using namespace std;
//
// // mac requires std::tolower, but IRIX MipsPro doesn't like it,
// // so use this preprocessor to allow mac and mipspro to work.

View File

@@ -2,6 +2,9 @@
#pragma warning( disable : 4786 )
#endif
#include <osg/GL>
#include <osgGLUT/glut>
#include <stdlib.h>
#if (!defined(WIN32) && !defined(macintosh)) || defined(__CYGWIN__)
#include <unistd.h>
@@ -49,12 +52,12 @@
#define USE_GLUT
#endif
#include <osgGLUT/glut>
/*
#if defined(WIN32) && !defined(__CYGWIN__)
#include <sys/timeb.h>
#else
#endif
*/
#include <osg/Timer>
osg::Timer g_timer;
@@ -72,6 +75,7 @@ using namespace osg;
using namespace osgUtil;
using namespace osgGLUT;
using namespace std;
Viewer* Viewer::s_theViewer = 0;
@@ -1081,8 +1085,13 @@ void Viewer::keyboard(unsigned char key, int x, int y)
}
break;
case 27 : // Escape
case 27 :
// Escape
#ifdef __MWERKS__
std::exit(0); // avoid collision of std::exit(..) / exit(..) compile errors.
#else
exit(0);
#endif
break;
}
}

View File

@@ -9,6 +9,8 @@
#include <osg/Notify>
#include <string.h>
VertexCache::VertexCache()
{
VertexCache(16);