diff options
| author | Chris Want <cwant@ualberta.ca> | 2005-09-15 01:50:37 +0400 |
|---|---|---|
| committer | Chris Want <cwant@ualberta.ca> | 2005-09-15 01:50:37 +0400 |
| commit | 0a2b71a3a4c18d80058e0b67fee9d41fced7c261 (patch) | |
| tree | f1801ae4ecda3122abd3204139b8c236ff5c5d52 /source | |
| parent | 902b11b84c34a229f94c976d385b6b033837172f (diff) | |
Getting blender to compile for IRIX, in particular:
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.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenlib/intern/freetypefont.c | 2 | ||||
| -rw-r--r-- | source/blender/src/header_image.c | 1 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_MouseFocusSensor.h | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c index f20be8ce828..577309a5474 100644 --- a/source/blender/blenlib/intern/freetypefont.c +++ b/source/blender/blenlib/intern/freetypefont.c @@ -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; } diff --git a/source/blender/src/header_image.c b/source/blender/src/header_image.c index 1d6593d0792..55f4b640bc7 100644 --- a/source/blender/src/header_image.c +++ b/source/blender/src/header_image.c @@ -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" diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.h b/source/gameengine/Ketsji/KX_MouseFocusSensor.h index 85ff0b83df6..cf7af709c48 100644 --- a/source/gameengine/Ketsji/KX_MouseFocusSensor.h +++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.h @@ -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 |