Merge branch 'master' of https://github.com/zinnschlag/openmw into cmakeogre

apps/openmw/mwscript/controlextensions.cpp

@@ -1,5 +1,5 @@
 
-#include "statsextensions.hpp"
+#include "controlextensions.hpp"
 
 #include <components/compiler/extensions.hpp>
 
@@ -48,7 +48,7 @@ namespace MWScript
 
                     bool enabled = context.getWorld().toggleCollisionMode();
 
-                    context.report (enabled ? "Collsion -> On" : "Collision -> Off");
+                    context.report (enabled ? "Collision -> On" : "Collision -> Off");
                 }
         };
 

cmake/OpenMWMacros.cmake

@@ -2,7 +2,7 @@
 macro (add_openmw_dir dir)
 set (files)
 foreach (u ${ARGN})
-file (GLOB ALL ${CMAKE_CURRENT_SOURCE_DIR} "${dir}/${u}.*")
+file (GLOB ALL ${CMAKE_CURRENT_SOURCE_DIR} "${dir}/${u}.[ch]pp")
 foreach (f ${ALL})
 list (APPEND files "${f}")
 list (APPEND OPENMW_FILES "${f}")
@@ -14,7 +14,7 @@ endmacro (add_openmw_dir)
 macro (add_component_dir dir)
 set (files)
 foreach (u ${ARGN})
-file (GLOB ALL ${CMAKE_CURRENT_SOURCE_DIR} "${dir}/${u}.*")
+file (GLOB ALL ${CMAKE_CURRENT_SOURCE_DIR} "${dir}/${u}.[ch]pp")
 foreach (f ${ALL})
 list (APPEND files "${f}")
 list (APPEND COMPONENT_FILES "${f}")