Fixes to get Blender compile and run on PowerPC OSX 10.3, gcc 3.3
authorTon Roosendaal <ton@blender.org>
Tue, 20 Oct 2009 15:51:18 +0000 (15:51 +0000)
committerTon Roosendaal <ton@blender.org>
Tue, 20 Oct 2009 15:51:18 +0000 (15:51 +0000)
(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)

source/blender/ikplugin/intern/itasc_plugin.cpp
source/gameengine/Converter/BL_ArmatureActuator.cpp
source/gameengine/Ketsji/KX_GameObject.cpp
source/nan_compile.mk

index b6fceabdb46e3c0cba73769bd8aec6ffb21c50a6..3dcb9e462b9d2ba53784d7cd676a4e0879897303 100644 (file)
@@ -1121,12 +1121,14 @@ static IK_Scene* convert_tree(Scene *blscene, Object *ob, bPoseChannel *pchan)
 
                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;
index a018f0f938d4dfa01d744d7c80243bcc47dce8ed..b70a0aa79e74e4e5978d5f1ac5ef7b3c70227717 100644 (file)
@@ -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.
index 9bb261fcba9a9339ab3fb8d3599e6e0af3beda02..d516d3e03ffacf80e02c54c018f4b72e5bfb62fd 100644 (file)
@@ -46,7 +46,6 @@ typedef unsigned long uint_ptr;
 
 
 #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 @@ typedef unsigned long uint_ptr;
 
 #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,
index 8d4da1e2790c4b90066b2b6a4870755c075b0281..6a1263e286cf8ffb2744c65491bb4ee351a565a2 100644 (file)
@@ -73,8 +73,8 @@ ifeq ($(OS),darwin)
     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