FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for Metrowerks Codewarrior build under Windows.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/BoundsChecking
View File

@@ -194,6 +194,6 @@ inline void clampArray4BetweenRange(A& value,const T minValue,const T maxValue,c
clampArrayElementsBetweenRange(value,0u,3u,minValue,maxValue,valueName);
}
};
}
#endif

2
include/osg/Export
View File

@@ -13,7 +13,7 @@
#pragma warning( disable : 4290 )
#endif
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__)
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__)
# ifdef SG_LIBRARY
# define SG_EXPORT __declspec(dllexport)
# else

6
include/osg/GL
View File

@@ -12,8 +12,8 @@
#ifdef __DARWIN_OSX__
#include <OpenGL/gl.h>
#else
#include <GL/gl.h>
#endif
#include <GL/gl.h>
#endif
#endif
// required for compatibility with glext.h sytle function definitions of
@@ -40,7 +40,7 @@
// to avoid name space pollution, but Win32's <GL/gl.h>
// needs APIENTRY and WINGDIAPI defined properly.
// F
# if 0
# if defined(__MWERKS__)
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
# else

2
include/osg/Math
View File

@@ -72,7 +72,7 @@ inline double inRadians(double angle) { return angle; }
inline double DegreesToRadians(double angle) { return angle*PI/180.0; }
inline double RadiansToDegrees(double angle) { return angle*180.0/PI; }
#if defined(WIN32) && !defined(__CYGWIN__)
#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__MWERKS__)
inline bool isNaN(float v) { return _isnan(v)!=0; }
inline bool isNaN(double v) { return _isnan(v)!=0; }
#else

2
include/osg/Statistics
View File

@@ -23,7 +23,7 @@ namespace osg {
* each trifan or tristrip = (length-2) triangles and so on.
*/
class SG_EXPORT Statistics : public osg::Referenced, public osg::Drawable::AttributeFunctor
class Statistics : public osg::Referenced, public osg::Drawable::AttributeFunctor
{
public:

2
include/osgDB/Export
View File

@@ -13,7 +13,7 @@
#endif
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__)
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__)
# ifdef OSGDB_LIBRARY
# define OSGDB_EXPORT __declspec(dllexport)
# else

2
include/osgDB/FieldReaderIterator
View File

@@ -23,7 +23,7 @@ class OSGDB_EXPORT FieldReaderIterator
FieldReaderIterator(const FieldReaderIterator& ic);
virtual ~FieldReaderIterator();
virtual FieldReaderIterator& operator = (const FieldReaderIterator& ic);
FieldReaderIterator& operator = (const FieldReaderIterator& ic);
void attach(std::istream* input);
void detach();

2
include/osgGLUT/Export
View File

@@ -13,7 +13,7 @@
#pragma warning( disable : 4786 )
#endif
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__)
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__)
# ifdef OSGGLUT_LIBRARY
# define OSGGLUT_EXPORT __declspec(dllexport)
# else

2
include/osgUtil/Export
View File

@@ -13,7 +13,7 @@
#pragma warning( disable : 4786 )
#endif
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__)
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__)
# ifdef OSGUTIL_LIBRARY
# define OSGUTIL_EXPORT __declspec(dllexport)
# else