MacOS-X fixes.
This commit is contained in:
@@ -59,7 +59,7 @@ inline int (isnan)(double r) { return isnan(r); }
|
|||||||
static ssgStateSelector *layer_states[SGCloudLayer::SG_MAX_CLOUD_COVERAGES];
|
static ssgStateSelector *layer_states[SGCloudLayer::SG_MAX_CLOUD_COVERAGES];
|
||||||
static bool state_initialized = false;
|
static bool state_initialized = false;
|
||||||
static bool bump_mapping = false;
|
static bool bump_mapping = false;
|
||||||
static int nb_texture_unit = 0;
|
static GLint nb_texture_unit = 0;
|
||||||
static ssgTexture *normal_map[SGCloudLayer::SG_MAX_CLOUD_COVERAGES][2] = { 0 };
|
static ssgTexture *normal_map[SGCloudLayer::SG_MAX_CLOUD_COVERAGES][2] = { 0 };
|
||||||
static ssgTexture *color_map[SGCloudLayer::SG_MAX_CLOUD_COVERAGES][2] = { 0 };
|
static ssgTexture *color_map[SGCloudLayer::SG_MAX_CLOUD_COVERAGES][2] = { 0 };
|
||||||
static GLuint normalization_cube_map;
|
static GLuint normalization_cube_map;
|
||||||
|
|||||||
@@ -37,8 +37,7 @@
|
|||||||
# ifdef __GNUC__
|
# ifdef __GNUC__
|
||||||
# if ( __GNUC__ >= 3 ) && ( __GNUC_MINOR__ >= 3 )
|
# if ( __GNUC__ >= 3 ) && ( __GNUC_MINOR__ >= 3 )
|
||||||
// # include <math.h>
|
// # include <math.h>
|
||||||
extern "C" int isnan (double);
|
inline int (isnan)(double r) { return !(r <= 0 || r >= 0); }
|
||||||
extern "C" int isinf (double);
|
|
||||||
# else
|
# else
|
||||||
// any C++ header file undefines isinf and isnan
|
// any C++ header file undefines isinf and isnan
|
||||||
// so this should be included before <iostream>
|
// so this should be included before <iostream>
|
||||||
|
|||||||
Reference in New Issue
Block a user