[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46057] trunk/blender/source/gameengine/ Ketsji/KX_KetsjiEngine.cpp: compile fixes:

[Nathan Letwory]

Revision: 46057
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46057
Author:   jesterking
Date:     2012-04-29 00:44:49 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
compile fixes:

* near and far var names confused mingw64, renamed
* mingw defines a macro named DrawText, confusing the DrawText function usage from KX_FontObject.

Modified Paths:
--------------
    trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp

Modified: trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp	2012-04-29 00:33:24 UTC (rev 46056)
+++ trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp	2012-04-29 00:44:49 UTC (rev 46057)
@@ -52,12 +52,9 @@
 #include "RAS_IRasterizer.h"
 #include "RAS_IRenderTools.h"
 #include "RAS_ICanvas.h"
-#include "STR_String.h"
 #include "MT_Vector3.h"
 #include "MT_Transform.h"
 #include "SCA_IInputDevice.h"
-#include "KX_Scene.h"
-#include "MT_CmMatrix4x4.h"
 #include "KX_Camera.h"
 #include "KX_FontObject.h"
 #include "KX_Dome.h"
@@ -90,6 +87,12 @@
 #define DEFAULT_LOGIC_TIC_RATE 60.0
 #define DEFAULT_PHYSICS_TIC_RATE 60.0
 
+#ifdef FREE_WINDOWS /* XXX mingw64 (gcc 4.7.0) defines a macro for DrawText that translates to DrawTextA. Not good */
+#ifdef DrawText
+#undef DrawText
+#endif
+#endif
+
 const char KX_KetsjiEngine::m_profileLabels[tc_numCategories][15] = {
 	"Physics:",		// tc_physics
 	"Logic:",		// tc_logic
@@ -1063,37 +1066,30 @@
 	m_overrideSceneName = forscene;
 }
 
-
-
 void KX_KetsjiEngine::SetCameraZoom(float camzoom)
 {
 	m_cameraZoom = camzoom;
 }
 
-
-
 void KX_KetsjiEngine::SetCameraOverrideUseOrtho(bool useOrtho)
 {
 	m_overrideCamUseOrtho = useOrtho;
 }
 
-
-
 void KX_KetsjiEngine::SetCameraOverrideProjectionMatrix(const MT_CmMatrix4x4& mat)
 {
 	m_overrideCamProjMat = mat;
 }
 
-
 void KX_KetsjiEngine::SetCameraOverrideViewMatrix(const MT_CmMatrix4x4& mat)
 {
 	m_overrideCamViewMat = mat;
 }
 
-void KX_KetsjiEngine::SetCameraOverrideClipping(float near, float far)
+void KX_KetsjiEngine::SetCameraOverrideClipping(float nearfrust, float farfrust)
 {
-	m_overrideCamNear = near;
-	m_overrideCamFar = far;
+	m_overrideCamNear = nearfrust;
+	m_overrideCamFar = farfrust;
 }
 
 void KX_KetsjiEngine::SetCameraOverrideLens(float lens)