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

From Pavel Moloshtan, fixes for Mingw32 build.

Browse Source
This commit is contained in:
Robert Osfield 2002-09-12 20:30:41 +00:00
parent 6c6fc36d7e
commit ee93b70033
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS
View File

@ -121,7 +121,7 @@ Ruben Lopez <ryu@gpul.org>
- Inventor ascii/VRML 1.0 loader. - Inventor ascii/VRML 1.0 loader.
Pavel Moloshtan <pasha@moloshtan.com> Pavel Moloshtan <pasha@moloshtan.com>
- Support for LWO2 format in the light wave loader. - Support for LWO2 format in the LightWave loader.
Alberto Barbati <abarbati@iaanus.com> Alberto Barbati <abarbati@iaanus.com>
- lazy evaluation of the inverse in the MatrixTransform. - lazy evaluation of the inverse in the MatrixTransform.

4
include/osg/GLExtensions
View File

@ -35,7 +35,7 @@ SG_EXPORT extern bool isGLExtensionSupported(const char *extension);
inline void* getGLExtensionFuncPtr(const char *funcName) inline void* getGLExtensionFuncPtr(const char *funcName)
{ {
#if defined(WIN32) #if defined(WIN32)
return wglGetProcAddress(funcName); return (void*)wglGetProcAddress(funcName);
#elif defined(__DARWIN_OSX__) #elif defined(__DARWIN_OSX__)
std::string temp( "_" ); std::string temp( "_" );
temp += funcName; // Mac OS X prepends an underscore on function names temp += funcName; // Mac OS X prepends an underscore on function names
@ -79,7 +79,7 @@ SG_EXPORT extern bool isGLUExtensionSupported(const char *extension);
inline void* getGLUExtensionFuncPtr(const char *funcName) inline void* getGLUExtensionFuncPtr(const char *funcName)
{ {
#if defined(WIN32) #if defined(WIN32)
return wglGetProcAddress(funcName); return (void*)wglGetProcAddress(funcName);
#elif defined(__DARWIN_OSX__) #elif defined(__DARWIN_OSX__)
std::string temp( "_" ); std::string temp( "_" );
temp += funcName; // Mac OS X prepends an underscore on function names temp += funcName; // Mac OS X prepends an underscore on function names

7
include/osg/Math
View File

@ -12,10 +12,11 @@
#endif #endif
#if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) ) || \ #if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) && !defined(__MINGW32__) ) || \
defined (sun) || \ defined (sun) || \
defined (__DARWIN_OSX__) defined (__DARWIN_OSX__)
#include <float.h> #include <float.h>
@ -57,7 +58,7 @@
#endif #endif
#if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) ) || \ #if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) && !defined(__MINGW32__) ) || \
defined (sun) defined (sun)
#ifndef isnanf #ifndef isnanf
@ -66,7 +67,7 @@
#endif #endif
#if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) ) || \ #if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) && !defined(__MINGW32__) ) || \
defined (sun) || \ defined (sun) || \
defined (__hpux__) defined (__hpux__)