griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Getting blender to compile for IRIX, in particular:

Browse Source 
IK: needed to change abs() to TNT::abs() (thanks brecht!)

Freetype: FT_ENCODING_UNICODE typecast to FT_CharMap (thanks intrr!)

header_image: missing include for liballoc stuff

Ketsji: needed to declare m_hitObject as public in KX_MouseFocusSensor.h.
This is probably the wrong thing to do, but KX_MouseFocusSensor.cpp
compilation fails on line 279 otherwise.
This commit is contained in:
Chris Want
2005-09-14 21:50:37 +00:00
parent 902b11b84c
commit 0a2b71a3a4
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
intern/iksolver/intern/TNT/svd.h
View File

@@ -232,7 +232,7 @@ void SVD(MaTRiX &A, MaTRiX &U, VecToR &s, MaTRiX &V, VecToR &work1, VecToR &work
if (k == -1) {
break;
}
if (abs(e[k]) <= eps*(abs(s[k]) + abs(s[k+1]))) {
if (TNT::abs(e[k]) <= eps*(TNT::abs(s[k]) + TNT::abs(s[k+1]))) {
e[k] = 0.0;
break;
}
@@ -245,9 +245,9 @@ void SVD(MaTRiX &A, MaTRiX &U, VecToR &s, MaTRiX &V, VecToR &work1, VecToR &work
if (ks == k) {
break;
}
typename MaTRiX::value_type t = (ks != p ? abs(e[ks]) : 0.) +
(ks != k+1 ? abs(e[ks-1]) : 0.);
if (abs(s[ks]) <= eps*t) {
typename MaTRiX::value_type t = (ks != p ? TNT::abs(e[ks]) : 0.) +
(ks != k+1 ? TNT::abs(e[ks-1]) : 0.);
if (TNT::abs(s[ks]) <= eps*t) {
s[ks] = 0.0;
break;
}
@@ -320,8 +320,8 @@ void SVD(MaTRiX &A, MaTRiX &U, VecToR &s, MaTRiX &V, VecToR &work1, VecToR &work
// Calculate the shift.
typename MaTRiX::value_type scale = max(max(max(max(
abs(s[p-1]),abs(s[p-2])),abs(e[p-2])),
abs(s[k])),abs(e[k]));
TNT::abs(s[p-1]),TNT::abs(s[p-2])),TNT::abs(e[p-2])),
TNT::abs(s[k])),TNT::abs(e[k]));
typename MaTRiX::value_type sp = s[p-1]/scale;
typename MaTRiX::value_type spm1 = s[p-2]/scale;
typename MaTRiX::value_type epm1 = e[p-2]/scale;

2
source/blender/blenlib/intern/freetypefont.c
View File

@@ -413,7 +413,7 @@ static VFontData *objfnt_to_ftvfontdata(PackedFile * pf)
lcode = charcode;
}
err = FT_Set_Charmap( face, FT_ENCODING_UNICODE );
err = FT_Set_Charmap( face, (FT_CharMap) FT_ENCODING_UNICODE );
return vfd;
}

1
source/blender/src/header_image.c
View File

@@ -56,6 +56,7 @@
#include "BDR_unwrapper.h"
#include "BKE_global.h"
#include "BKE_image.h"
#include "BKE_library.h"
#include "BKE_main.h"
#include "BKE_packedFile.h"
#include "BKE_utildefines.h"

3
source/gameengine/Ketsji/KX_MouseFocusSensor.h
View File

@@ -95,6 +95,7 @@ class KX_MouseFocusSensor : public SCA_MouseSensor
KX_PYMETHOD_DOC(KX_MouseFocusSensor,GetRayDirection);
/* --------------------------------------------------------------------- */
SCA_IObject* m_hitObject;
private:
/**
@@ -138,8 +139,6 @@ class KX_MouseFocusSensor : public SCA_MouseSensor
* the object was hit. */
MT_Vector3 m_hitNormal;
SCA_IObject* m_hitObject;
/**
* Ref to the engine, for retrieving a reference to the current