Fixes for Cywin gcc3.x build in GL and Math headers.
Fix for VS build in osgshadowtexture.
This commit is contained in:
@@ -68,8 +68,9 @@
|
||||
#define DECLSPEC_IMPORT __declspec(dllimport)
|
||||
#define WINGDIAPI DECLSPEC_IMPORT
|
||||
#endif
|
||||
// XXX This is from Win32's <ctype.h>
|
||||
#ifndef _WCHAR_T_DEFINED
|
||||
// XXX This is from Win32's <ctype.h>
|
||||
|
||||
#if !defined(_WCHAR_T_DEFINED) && !(defined(__GNUC__)&&(__GNUC__ == 3))
|
||||
typedef unsigned short wchar_t;
|
||||
#define _WCHAR_T_DEFINED
|
||||
#endif
|
||||
|
||||
@@ -7,6 +7,10 @@
|
||||
|
||||
#include <math.h>
|
||||
|
||||
#if defined(__GNUC__) && defined(WIN32)
|
||||
# include <iostream>
|
||||
#endif
|
||||
|
||||
// for OSX users :
|
||||
// comment in if you want backwards compatibility with 10.1.x versions
|
||||
// otherwise you'll have problems with missing floorf and __isnan*()
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
#include "CreateShadowedScene.h"
|
||||
|
||||
|
||||
using namespace osg;
|
||||
|
||||
class CreateShadowTextureCullCallback : public osg::NodeCallback
|
||||
{
|
||||
@@ -55,7 +55,7 @@ class CreateShadowTextureCullCallback : public osg::NodeCallback
|
||||
|
||||
// we need this to get round the order dependance
|
||||
// of eye linear tex gen...
|
||||
class MyTexGen : public osg::TexGen
|
||||
class MyTexGen : public TexGen
|
||||
{
|
||||
public:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user