Modified Files:

	simgear/scene/util/SGDebugDrawCallback.hxx
	simgear/math/SGQuat.hxx: Olaf Flebbe: Make it compile on some more
	win32 variants.

diff --git a/simgear/math/SGQuat.hxx b/simgear/math/SGQuat.hxx
index b65de8dc6dc790acef8c9d2c86841f15580e795d..93f071effbcdc504602dd424b0b86bec8cc56980 100644 (file)
--- 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 <osg/Quat>
 
 template<typename T>

diff --git a/simgear/scene/util/SGDebugDrawCallback.hxx b/simgear/scene/util/SGDebugDrawCallback.hxx
index 3754423b778451b3515cc37a11affec26352cb72..914d0d1ab3b59b5fb580011b1f5d726739249eae 100644 (file)
--- 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);