Getting blender to compile for IRIX, in particular:
authorChris Want <cwant@ualberta.ca>
Wed, 14 Sep 2005 21:50:37 +0000 (21:50 +0000)
committerChris Want <cwant@ualberta.ca>
Wed, 14 Sep 2005 21:50:37 +0000 (21:50 +0000)
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.

intern/iksolver/intern/TNT/svd.h
source/blender/blenlib/intern/freetypefont.c
source/blender/src/header_image.c
source/gameengine/Ketsji/KX_MouseFocusSensor.h

index 1b25361811e1627164a3a250e6b4218098ec9b5a..af281d0fce0e0ca1e6bed74ebc5b248337b5880a 100644 (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;
index f20be8ce8281e640e88db2e11434b5b1e20ab9e4..577309a5474bfd679572bcbaef3a07a53c0cea93 100644 (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;     
 }
index 1d6593d0792a19e42e61c151089ef8f529e7f036..55f4b640bc72de1f02542e43e329e5ff61f016ed 100644 (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"
index 85ff0b83df65ca906857b51b5c6b34b2455e9b70..cf7af709c4897a1ac66d89dee64d5092f03eac4b 100644 (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