fix for error in recent commit (made function static that shouldn't have been), add extra gcc warnings to cmake.

6 files changed, 21 insertions, 12 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83e094b4375..8dc2a4b59cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/GNUmakefile b/GNUmakefile
index 1f1de3f6b99..7b333a5fc77 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -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 ""
diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake
index b834cd37a8a..ae07743191b 100644
--- a/build_files/cmake/config/blender_lite.cmake
+++ b/build_files/cmake/config/blender_lite.cmake
@@ -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)
diff --git a/intern/iksolver/intern/IK_Solver.cpp b/intern/iksolver/intern/IK_Solver.cpp
index 6c2e30932bb..ef4ab1f2f91 100644
--- a/intern/iksolver/intern/IK_Solver.cpp
+++ b/intern/iksolver/intern/IK_Solver.cpp
@@ -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;
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;