[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24006] trunk/blender/source: Fixes to get Blender compile and run on PowerPC OSX 10.3, gcc 3.3

[Ton Roosendaal]

Revision: 24006
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24006
Author:   ton
Date:     2009-10-20 17:51:18 +0200 (Tue, 20 Oct 2009)

Log Message:
-----------
Fixes to get Blender compile and run on PowerPC OSX 10.3, gcc 3.3
(yes antique, but having 5 year old OS's work is very cool)

In short:
- include <cmath> after <math.h> fails
- STL template issues (recursion, syntax)

Modified Paths:
--------------
    trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp
    trunk/blender/source/gameengine/Converter/BL_ArmatureActuator.cpp
    trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
    trunk/blender/source/nan_compile.mk

Modified: trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp
===================================================================
--- trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp	2009-10-20 15:23:04 UTC (rev 24005)
+++ trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp	2009-10-20 15:51:18 UTC (rev 24006)
@@ -1121,12 +1121,14 @@
 
 		KDL::Frame tip(iTaSC::F_identity);
 		Vector3 *fl = bone->bone_mat;
-		KDL::Frame head(KDL::Rotation(
-			fl[0][0], fl[1][0], fl[2][0],
-			fl[0][1], fl[1][1], fl[2][1],
-			fl[0][2], fl[1][2], fl[2][2]),
-			KDL::Vector(bone->head[0], bone->head[1], bone->head[2])*scale);
-
+		KDL::Rotation brot(
+						   fl[0][0], fl[1][0], fl[2][0],
+						   fl[0][1], fl[1][1], fl[2][1],
+						   fl[0][2], fl[1][2], fl[2][2]);
+		KDL::Vector bpos(bone->head[0], bone->head[1], bone->head[2]);
+		bpos = bpos*scale;
+		KDL::Frame head(brot, bpos);
+		
 		// rest pose length of the bone taking scaling into account
 		length= bone->length*scale;
 		parent = (a > 0) ? ikscene->channels[tree->parent[a]].tail : root;

Modified: trunk/blender/source/gameengine/Converter/BL_ArmatureActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_ArmatureActuator.cpp	2009-10-20 15:23:04 UTC (rev 24005)
+++ trunk/blender/source/gameengine/Converter/BL_ArmatureActuator.cpp	2009-10-20 15:51:18 UTC (rev 24006)
@@ -31,9 +31,9 @@
 #include "DNA_constraint_types.h"
 #include "DNA_actuator_types.h"
 #include "BKE_constraint.h"
-#include "BLI_arithb.h"
 #include "BL_ArmatureActuator.h"
 #include "BL_ArmatureObject.h"
+#include "BLI_arithb.h"
 
 /**
  * This class is the conversion of the Pose channel constraint.

Modified: trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp	2009-10-20 15:23:04 UTC (rev 24005)
+++ trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp	2009-10-20 15:51:18 UTC (rev 24006)
@@ -46,7 +46,6 @@
 
 
 #define KX_INERTIA_INFINITE 10000
-#include "BLI_arithb.h"
 #include "RAS_IPolygonMaterial.h"
 #include "KX_BlenderMaterial.h"
 #include "KX_GameObject.h"
@@ -80,6 +79,8 @@
 
 #include "KX_SG_NodeRelationships.h"
 
+#include "BLI_arithb.h"
+
 static MT_Point3 dummy_point= MT_Point3(0.0, 0.0, 0.0);
 static MT_Vector3 dummy_scaling = MT_Vector3(1.0, 1.0, 1.0);
 static MT_Matrix3x3 dummy_orientation = MT_Matrix3x3(	1.0, 0.0, 0.0,

Modified: trunk/blender/source/nan_compile.mk
===================================================================
--- trunk/blender/source/nan_compile.mk	2009-10-20 15:23:04 UTC (rev 24005)
+++ trunk/blender/source/nan_compile.mk	2009-10-20 15:51:18 UTC (rev 24006)
@@ -73,8 +73,8 @@
     CC  ?= gcc
     CCC ?= g++
     ifeq ($(CPU),powerpc)
-        CFLAGS  += -pipe -fPIC -ffast-math -mcpu=7450 -mtune=G5 -funsigned-char -fno-strict-aliasing
-        CCFLAGS += -pipe -fPIC  -funsigned-char -fno-strict-aliasing
+        CFLAGS  += -pipe -fPIC -ffast-math -mcpu=7450 -mtune=G5 -funsigned-char -fno-strict-aliasing -Wno-long-double
+        CCFLAGS += -pipe -fPIC  -funsigned-char -fno-strict-aliasing -Wno-long-double
     else
         CFLAGS  += -pipe -fPIC -ffast-math -march=pentium-m -funsigned-char -fno-strict-aliasing
         CCFLAGS += -pipe -fPIC  -funsigned-char -fno-strict-aliasing