diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-06-17 15:52:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-06-17 16:00:13 +0400 |
| commit | 10af70cef8962744b1509614496861ee9c4a37e0 (patch) | |
| tree | 4cc450df7043559b49269c81ec2c98ed59955cc9 /source/gameengine/Ketsji | |
| parent | c40cc0bf6d93bde49f1ae16a663cb504d1a588d3 (diff) | |
Support for building without Python
Diffstat (limited to 'source/gameengine/Ketsji')
| -rw-r--r-- | source/gameengine/Ketsji/KX_KetsjiEngine.cpp | 4 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_ObjectActuator.cpp | 1 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_TouchEventManager.cpp | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp index dc81bae1f0c..7d7e15a5141 100644 --- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp +++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp @@ -514,13 +514,13 @@ void KX_KetsjiEngine::EndFrame() RenderDebugProperties(); } - double tottime = m_logger->GetAverage(), time; + double tottime = m_logger->GetAverage(); if (tottime < 1e-6) tottime = 1e-6; #ifdef WITH_PYTHON for (int i = tc_first; i < tc_numCategories; ++i) { - time = m_logger->GetAverage((KX_TimeCategory)i); + double time = m_logger->GetAverage((KX_TimeCategory)i); PyObject *val = PyTuple_New(2); PyTuple_SetItem(val, 0, PyFloat_FromDouble(time*1000.f)); PyTuple_SetItem(val, 1, PyFloat_FromDouble(time/tottime * 100.f)); diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.cpp b/source/gameengine/Ketsji/KX_ObjectActuator.cpp index 2f85453dd23..0eec86987be 100644 --- a/source/gameengine/Ketsji/KX_ObjectActuator.cpp +++ b/source/gameengine/Ketsji/KX_ObjectActuator.cpp @@ -32,6 +32,7 @@ * \ingroup ketsji */ +#include <stdio.h> #include "KX_ObjectActuator.h" #include "KX_GameObject.h" diff --git a/source/gameengine/Ketsji/KX_TouchEventManager.cpp b/source/gameengine/Ketsji/KX_TouchEventManager.cpp index d010d3d50a0..40e5eb00b79 100644 --- a/source/gameengine/Ketsji/KX_TouchEventManager.cpp +++ b/source/gameengine/Ketsji/KX_TouchEventManager.cpp @@ -97,9 +97,14 @@ bool KX_TouchEventManager::newBroadphaseResponse(void *client_data, bool has_py_callbacks = false; +#ifdef WITH_PYTHON // Consider callbacks for broadphase inclusion if it's a sensor object type if (gobj1 && gobj2) has_py_callbacks = gobj1->m_collisionCallbacks || gobj2->m_collisionCallbacks; +#else + (void)gobj1; + (void)gobj2; +#endif switch (info1->m_type) { |