fix for error in recent commit (made function static that shouldn't have been), add...
authorCampbell Barton <ideasman42@gmail.com>
Sun, 16 Sep 2012 01:35:00 +0000 (01:35 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 16 Sep 2012 01:35:00 +0000 (01:35 +0000)
CMakeLists.txt
GNUmakefile
build_files/cmake/config/blender_lite.cmake
intern/iksolver/intern/IK_Solver.cpp
source/gameengine/Ketsji/KX_PythonInitTypes.cpp
source/gameengine/VideoTexture/blendVideoTex.cpp

index 83e094b437532a4a5176f7e2315adbf3bbc10133..8dc2a4b59cf79f1e0d26dfe265644e379735ba18 100644 (file)
@@ -1725,6 +1725,11 @@ if(CMAKE_COMPILER_IS_GNUCC)
        ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_POINTER_ARITH -Wpointer-arith)
        ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_PARAMETER -Wunused-parameter)
        ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_WRITE_STRINGS -Wwrite-strings)
+       ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_LOGICAL_OP -Wlogical-op)
+       ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNDEF -Wundef)
+       ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNINITIALIZED -Wuninitialized)
+       ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_INIT_SELF -Winit-self)  # needs -Wuninitialized
+       ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_NULL -Wnonnull)
 
        # # this causes too many warnings, disable
        # ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNDEFINED -Wundef)
@@ -1739,6 +1744,12 @@ if(CMAKE_COMPILER_IS_GNUCC)
        ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall)
        ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof)
        ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare)
+       ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_MISSING_DECLARATIONS -Wmissing-declarations)
+       ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_LOGICAL_OP -Wlogical-op)
+       ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNDEF -Wundef)
+       ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNINITIALIZED -Wuninitialized)
+       ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_INIT_SELF -Winit-self)  # needs -Wuninitialized
+       ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_NULL -Wnonnull)
 
        # # this causes too many warnings, disable
        # ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNDEFINED -Wundef)
index 1f1de3f6b99a14cea1d33499158e41194b58984d..7b333a5fc77083ae13b9809b06fa7d5a1495d495 100644 (file)
@@ -173,6 +173,7 @@ help:
        @echo "  * check_cppcheck    - run blender source through cppcheck (C & C++)"
        @echo "  * check_splint      - run blenders source through splint (C only)"
        @echo "  * check_sparse      - run blenders source through sparse (C only)"
+       @echo "  * check_smatch      - run blenders source through smatch (C only)"
        @echo "  * check_spelling_c  - check for spelling errors (C/C++ only)"
        @echo "  * check_spelling_py - check for spelling errors (Python only)"
        @echo ""
index b834cd37a8a27f67236cc4c3d87f5b63a5c62793..ae07743191b26874ce771e5e3046e289e2bc4e4e 100644 (file)
@@ -42,6 +42,7 @@ set(WITH_MOD_OCEANSIM        OFF CACHE FORCE BOOL)
 set(WITH_AUDASPACE           OFF CACHE FORCE BOOL)
 set(WITH_OPENAL              OFF CACHE FORCE BOOL)
 set(WITH_OPENCOLLADA         OFF CACHE FORCE BOOL)
+set(WITH_OPENCOLORIO         OFF CACHE FORCE BOOL)
 set(WITH_OPENMP              OFF CACHE FORCE BOOL)
 set(WITH_PYTHON_INSTALL      OFF CACHE FORCE BOOL)
 set(WITH_RAYOPTIMIZATION     OFF CACHE FORCE BOOL)
index 6c2e30932bbfab735abec14b4d0cb43bb9a9457e..ef4ab1f2f914b679283c85140ca1cf54895a1dbf 100644 (file)
@@ -51,7 +51,7 @@ public:
 };
 
 // FIXME: locks still result in small "residual" changes to the locked axes...
-IK_QSegment *CreateSegment(int flag, bool translate)
+static IK_QSegment *CreateSegment(int flag, bool translate)
 {
        int ndof = 0;
        ndof += (flag & IK_XDOF) ? 1 : 0;
@@ -348,7 +348,7 @@ float IK_SolverGetPoleAngle(IK_Solver *solver)
        return qsolver->solver.GetPoleAngle();
 }
 
-void IK_SolverAddCenterOfMass(IK_Solver *solver, IK_Segment *root, float goal[3], float weight)
+static void IK_SolverAddCenterOfMass(IK_Solver *solver, IK_Segment *root, float goal[3], float weight)
 {
        if (solver == NULL || root == NULL)
                return;
index 4c5e10f2a04534e1f3694ba0201d5812205e2475..d0e3d26f61b23065e01e7f1218d47660d6d5aa91 100644 (file)
  *  \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
index b05675c880a656e76cdd12fbeec65fce1e969a13..7d595832ffdd938968738176e61186debac62a8a 100644 (file)
@@ -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;