Fixed build when MATH_GRAPHICSENGINE_INTEROP is not defined and MATH_…

…CONTAINERLIB_SUPPORT is not defined.
juj · Jun 12, 2012 · 41649ff · 41649ff
1 parent 59ccea8
commit 41649ff
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/Geometry/Frustum.cpp b/src/Geometry/Frustum.cpp
@@ -34,7 +34,7 @@
 #include "Math/float4.h"
 #include "Math/Quat.h"
 
-#ifdef MATH_TINYXML_INTEROP
+#if defined(MATH_TINYXML_INTEROP) && defined(MATH_CONTAINERLIB_SUPPORT)
 #include "Container/UString.h"
 #endif
 
@@ -131,7 +131,7 @@ float4x4 Frustum::ProjectionMatrix() const
 	assume(type == PerspectiveFrustum || type == OrthographicFrustum);
 	if (type == PerspectiveFrustum)
 	{
-		return float4x4::D3DPerspProjRH(nearPlaneDistance, farPlaneDistance, orthographicWidth, orthographicHeight);
+		return float4x4::D3DPerspProjRH(nearPlaneDistance, farPlaneDistance, horizontalFov, verticalFov);
 	}
 	else
 	{
@@ -572,7 +572,7 @@ bool Frustum::Intersects(const Polyhedron &polyhedron) const
 	return this->ToPolyhedron().Intersects(polyhedron);
 }
 
-#ifdef MATH_TINYXML_INTEROP
+#if defined(MATH_TINYXML_INTEROP) && defined(MATH_CONTAINERLIB_SUPPORT)
 
 void Frustum::DeserializeFromXml(TiXmlElement *e)
 {

diff --git a/src/Geometry/Frustum.h b/src/Geometry/Frustum.h
@@ -354,7 +354,7 @@ class Frustum
 	bool Intersects(const Frustum &frustum) const;
 	bool Intersects(const Polyhedron &polyhedron) const;
 
-#ifdef MATH_TINYXML_INTEROP
+#if defined(MATH_TINYXML_INTEROP) && defined(MATH_CONTAINERLIB_SUPPORT)
 	void DeserializeFromXml(TiXmlElement *e);
 #endif
 

diff --git a/src/Geometry/KDTree.h b/src/Geometry/KDTree.h
@@ -2,8 +2,6 @@
 
 #include "Types.h"
 
-#define MATH_CONTAINERLIB_SUPPORT
-
 #ifdef MATH_CONTAINERLIB_SUPPORT
 #include "Container/MaxHeap.h"
 #endif