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)
This commit is contained in:
Ton Roosendaal 2009-10-20 15:51:18 +00:00
parent 5571d37e94
commit 0e5a6a21e8
4 changed files with 13 additions and 10 deletions

@ -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;

@ -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.

@ -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,

@ -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