From 1f32786c8209441f6c8ff99994a9023e0ebcf6a8 Mon Sep 17 00:00:00 2001 From: frohlich Date: Tue, 7 Nov 2006 05:46:25 +0000 Subject: [PATCH] Modified Files: simgear/scene/util/SGDebugDrawCallback.hxx simgear/math/SGQuat.hxx: Olaf Flebbe: Make it compile on some more win32 variants. --- simgear/math/SGQuat.hxx | 5 +++++ simgear/scene/util/SGDebugDrawCallback.hxx | 2 ++ 2 files changed, 7 insertions(+) diff --git a/simgear/math/SGQuat.hxx b/simgear/math/SGQuat.hxx index b65de8dc..93f071ef 100644 --- a/simgear/math/SGQuat.hxx +++ b/simgear/math/SGQuat.hxx @@ -26,6 +26,11 @@ #undef max #endif +// for microsoft compiler +#ifdef _MSC_VER +#define copysign _copysign +#endif + #include template diff --git a/simgear/scene/util/SGDebugDrawCallback.hxx b/simgear/scene/util/SGDebugDrawCallback.hxx index 3754423b..914d0d1a 100644 --- a/simgear/scene/util/SGDebugDrawCallback.hxx +++ b/simgear/scene/util/SGDebugDrawCallback.hxx @@ -131,7 +131,9 @@ do { \ PRINT_STATE(GL_STENCIL_TEST); PRINT_STATE(GL_TEXTURE_1D); PRINT_STATE(GL_TEXTURE_2D); +#ifdef GL_TEXTURE_3D PRINT_STATE(GL_TEXTURE_3D); +#endif PRINT_STATE(GL_TEXTURE_GEN_Q); PRINT_STATE(GL_TEXTURE_GEN_R); PRINT_STATE(GL_TEXTURE_GEN_S); -- 2.39.5