diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-09-16 05:35:00 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-16 05:35:00 +0400 |
commit | c2a1dcf6218cbd56126a5deb1aeaf212d67e54cb (patch) | |
tree | f669a08de71815eaaefa27668e5d11c8fa787106 /source/gameengine | |
parent | d724d0adfe10db8042f0d4d2a971e73b0bcec902 (diff) |
fix for error in recent commit (made function static that shouldn't have been), add extra gcc warnings to cmake.
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/Ketsji/KX_PythonInitTypes.cpp | 12 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/blendVideoTex.cpp | 4 |
2 files changed, 6 insertions, 10 deletions
diff --git a/source/gameengine/Ketsji/KX_PythonInitTypes.cpp b/source/gameengine/Ketsji/KX_PythonInitTypes.cpp index 4c5e10f2a04..d0e3d26f61b 100644 --- a/source/gameengine/Ketsji/KX_PythonInitTypes.cpp +++ b/source/gameengine/Ketsji/KX_PythonInitTypes.cpp @@ -29,14 +29,10 @@ * \ingroup ketsji */ - - - -#ifndef _adr_py_init_types_h_ // only process once, -#define _adr_py_init_types_h_ // even if multiply included - #ifdef WITH_PYTHON +#include "KX_PythonInitTypes.h" + /* Only for Class::Parents */ #include "BL_BlenderShader.h" #include "BL_ShapeActionActuator.h" @@ -164,7 +160,7 @@ static void PyType_Ready_ADD(PyObject *dict, PyTypeObject *tp, PyAttributeDef *a #define PyType_Ready_Attr(d, n, i) PyType_Ready_ADD(d, &n::Type, n::Attributes, NULL, i) #define PyType_Ready_AttrPtr(d, n, i) PyType_Ready_ADD(d, &n::Type, n::Attributes, n::AttributesPtr, i) -static void initPyTypes(void) +void initPyTypes(void) { /* @@ -266,5 +262,3 @@ static void initPyTypes(void) } #endif // WITH_PYTHON - -#endif diff --git a/source/gameengine/VideoTexture/blendVideoTex.cpp b/source/gameengine/VideoTexture/blendVideoTex.cpp index b05675c880a..7d595832ffd 100644 --- a/source/gameengine/VideoTexture/blendVideoTex.cpp +++ b/source/gameengine/VideoTexture/blendVideoTex.cpp @@ -26,6 +26,8 @@ http://www.gnu.org/copyleft/lesser.txt. #include "PyObjectPlus.h" +#include "KX_PythonInit.h" + #include <RAS_GLExtensionManager.h> #include <RAS_IPolygonMaterial.h> @@ -168,7 +170,7 @@ static struct PyModuleDef VideoTexture_module_def = { 0, /* m_free */ }; -static PyObject *initVideoTexture(void) +PyObject *initVideoTexture(void) { PyObject * m; |