From Mathias Froechlich, "Attached the collected fixes I needed to compile with all of them.

Most notable the __hpux define stuff. The __hpux__ variant seems to be not
defined which resulted in a compile error at this time. Consequently I have
replaced all occurances of __hpux__ with __hpux. And huge surprise: now osg
plugins are found and loaded correctly ...
The next notable one is the MSVC_IDE fix which makes the nmake Makefiles cmake
generator target behave like the ide one. Showed up because I started to do
scripted builds with nmake instead of devenv...
The rest is the usual bunch of stuff that just happens during normal
coding ..."
This commit is contained in:
Robert Osfield
2009-11-18 12:15:29 +00:00
parent 259daac9a9
commit b7cabac990
13 changed files with 29 additions and 32 deletions

View File

@@ -86,6 +86,10 @@
inline float atan2f(float value1, float value2) { return static_cast<float>(atan2(value1,value2)); }
#endif
#ifndef fmodf
inline float fmodf(float value1, float value2) { return static_cast<float>(fmod(value1,value2)); }
#endif
#ifndef tanf
inline float tanf(float value) { return static_cast<float>(tan(value)); }
#endif
@@ -199,7 +203,7 @@ inline double RadiansToDegrees(double angle) { return angle*180.0/PI; }
inline float round(float v) { return v>=0.0f?floorf(v+0.5f):ceilf(v-0.5f); }
inline double round(double v) { return v>=0.0?floor(v+0.5):ceil(v-0.5); }
#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__MWERKS__)
#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

View File

@@ -18,6 +18,7 @@
#include <osgPresentation/Export>
#include <iosfwd>
#include <map>
#include <float.h>