Avoid identically named source files - some build systems have proble…

…ms with it, even if CMake have none (headermaps in XCode, shared intermediate folder in Visual Studio)
OGRECave · Dec 18, 2024 · c5a01bc · c5a01bc
1 parent 75801f3
commit c5a01bc
Show file tree

Hide file tree

Showing 73 changed files with 67 additions and 67 deletions.
diff --git a/...Main/include/Math/Array/C/OgreArrayAabb.h → ...ain/include/Math/Array/C/OgreArrayAabbC.h b/...Main/include/Math/Array/C/OgreArrayAabb.h → ...ain/include/Math/Array/C/OgreArrayAabbC.h
@@ -177,6 +177,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayAabb.inl"
+#include "OgreArrayAabbC.inl"
 
 #endif
diff --git a/...in/include/Math/Array/C/OgreArrayAabb.inl → ...n/include/Math/Array/C/OgreArrayAabbC.inl b/...in/include/Math/Array/C/OgreArrayAabb.inl → ...n/include/Math/Array/C/OgreArrayAabbC.inl
diff --git a/...n/include/Math/Array/C/OgreArrayMatrix4.h → .../include/Math/Array/C/OgreArrayMatrix4C.h b/...n/include/Math/Array/C/OgreArrayMatrix4.h → .../include/Math/Array/C/OgreArrayMatrix4C.h
@@ -250,6 +250,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayMatrix4.inl"
+#include "OgreArrayMatrix4C.inl"
 
 #endif
diff --git a/...include/Math/Array/C/OgreArrayMatrix4.inl → ...nclude/Math/Array/C/OgreArrayMatrix4C.inl b/...include/Math/Array/C/OgreArrayMatrix4.inl → ...nclude/Math/Array/C/OgreArrayMatrix4C.inl
diff --git a/...clude/Math/Array/C/OgreArrayMatrixAf4x3.h → ...lude/Math/Array/C/OgreArrayMatrixAf4x3C.h b/...clude/Math/Array/C/OgreArrayMatrixAf4x3.h → ...lude/Math/Array/C/OgreArrayMatrixAf4x3C.h
@@ -274,6 +274,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayMatrixAf4x3.inl"
+#include "OgreArrayMatrixAf4x3C.inl"
 
 #endif
diff --git a/...ude/Math/Array/C/OgreArrayMatrixAf4x3.inl → ...de/Math/Array/C/OgreArrayMatrixAf4x3C.inl b/...ude/Math/Array/C/OgreArrayMatrixAf4x3.inl → ...de/Math/Array/C/OgreArrayMatrixAf4x3C.inl
diff --git a/...nclude/Math/Array/C/OgreArrayQuaternion.h → ...clude/Math/Array/C/OgreArrayQuaternionC.h b/...nclude/Math/Array/C/OgreArrayQuaternion.h → ...clude/Math/Array/C/OgreArrayQuaternionC.h
@@ -257,6 +257,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayQuaternion.inl"
+#include "OgreArrayQuaternionC.inl"
 
 #endif
diff --git a/...lude/Math/Array/C/OgreArrayQuaternion.inl → ...ude/Math/Array/C/OgreArrayQuaternionC.inl b/...lude/Math/Array/C/OgreArrayQuaternion.inl → ...ude/Math/Array/C/OgreArrayQuaternionC.inl
diff --git a/...in/include/Math/Array/C/OgreArraySphere.h → ...n/include/Math/Array/C/OgreArraySphereC.h b/...in/include/Math/Array/C/OgreArraySphere.h → ...n/include/Math/Array/C/OgreArraySphereC.h
@@ -121,6 +121,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArraySphere.inl"
+#include "OgreArraySphereC.inl"
 
 #endif
diff --git a/.../include/Math/Array/C/OgreArraySphere.inl → ...include/Math/Array/C/OgreArraySphereC.inl b/.../include/Math/Array/C/OgreArraySphere.inl → ...include/Math/Array/C/OgreArraySphereC.inl
diff --git a/...n/include/Math/Array/C/OgreArrayVector2.h → .../include/Math/Array/C/OgreArrayVector2C.h b/...n/include/Math/Array/C/OgreArrayVector2.h → .../include/Math/Array/C/OgreArrayVector2C.h
@@ -337,6 +337,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayVector2.inl"
+#include "OgreArrayVector2C.inl"
 
 #endif
diff --git a/...include/Math/Array/C/OgreArrayVector2.inl → ...nclude/Math/Array/C/OgreArrayVector2C.inl b/...include/Math/Array/C/OgreArrayVector2.inl → ...nclude/Math/Array/C/OgreArrayVector2C.inl
diff --git a/...n/include/Math/Array/C/OgreArrayVector3.h → .../include/Math/Array/C/OgreArrayVector3C.h b/...n/include/Math/Array/C/OgreArrayVector3.h → .../include/Math/Array/C/OgreArrayVector3C.h
@@ -358,6 +358,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayVector3.inl"
+#include "OgreArrayVector3C.inl"
 
 #endif
diff --git a/...include/Math/Array/C/OgreArrayVector3.inl → ...nclude/Math/Array/C/OgreArrayVector3C.inl b/...include/Math/Array/C/OgreArrayVector3.inl → ...nclude/Math/Array/C/OgreArrayVector3C.inl
diff --git a/...n/include/Math/Array/C/OgreArrayVector4.h → .../include/Math/Array/C/OgreArrayVector4C.h b/...n/include/Math/Array/C/OgreArrayVector4.h → .../include/Math/Array/C/OgreArrayVector4C.h
@@ -278,6 +278,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayVector4.inl"
+#include "OgreArrayVector4C.inl"
 
 #endif
diff --git a/...include/Math/Array/C/OgreArrayVector4.inl → ...nclude/Math/Array/C/OgreArrayVector4C.inl b/...include/Math/Array/C/OgreArrayVector4.inl → ...nclude/Math/Array/C/OgreArrayVector4C.inl
diff --git a/...in/include/Math/Array/C/OgreBooleanMask.h → ...n/include/Math/Array/C/OgreBooleanMaskC.h b/...in/include/Math/Array/C/OgreBooleanMask.h → ...n/include/Math/Array/C/OgreBooleanMaskC.h
@@ -63,6 +63,6 @@ namespace Ogre
     };
 }  // namespace Ogre
 
-#include "OgreBooleanMask.inl"
+#include "OgreBooleanMaskC.inl"
 
 #endif
diff --git a/.../include/Math/Array/C/OgreBooleanMask.inl → ...include/Math/Array/C/OgreBooleanMaskC.inl b/.../include/Math/Array/C/OgreBooleanMask.inl → ...include/Math/Array/C/OgreBooleanMaskC.inl
diff --git a/...de/Math/Array/NEON/Single/OgreArrayAabb.h → ...ath/Array/NEON/Single/OgreArrayAabbNEON.h b/...de/Math/Array/NEON/Single/OgreArrayAabb.h → ...ath/Array/NEON/Single/OgreArrayAabbNEON.h
@@ -177,6 +177,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayAabb.inl"
+#include "OgreArrayAabbNEON.inl"
 
 #endif
diff --git a/.../Math/Array/NEON/Single/OgreArrayAabb.inl → ...h/Array/NEON/Single/OgreArrayAabbNEON.inl b/.../Math/Array/NEON/Single/OgreArrayAabb.inl → ...h/Array/NEON/Single/OgreArrayAabbNEON.inl
diff --git a/...Math/Array/NEON/Single/OgreArrayMatrix4.h → .../Array/NEON/Single/OgreArrayMatrix4NEON.h b/...Math/Array/NEON/Single/OgreArrayMatrix4.h → .../Array/NEON/Single/OgreArrayMatrix4NEON.h
@@ -253,6 +253,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayMatrix4.inl"
+#include "OgreArrayMatrix4NEON.inl"
 
 #endif
diff --git a/...th/Array/NEON/Single/OgreArrayMatrix4.inl → ...rray/NEON/Single/OgreArrayMatrix4NEON.inl b/...th/Array/NEON/Single/OgreArrayMatrix4.inl → ...rray/NEON/Single/OgreArrayMatrix4NEON.inl
diff --git a/.../Array/NEON/Single/OgreArrayMatrixAf4x3.h → ...ay/NEON/Single/OgreArrayMatrixAf4x3NEON.h b/.../Array/NEON/Single/OgreArrayMatrixAf4x3.h → ...ay/NEON/Single/OgreArrayMatrixAf4x3NEON.h
@@ -247,6 +247,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayMatrixAf4x3.inl"
+#include "OgreArrayMatrixAf4x3NEON.inl"
 
 #endif
diff --git a/...rray/NEON/Single/OgreArrayMatrixAf4x3.inl → .../NEON/Single/OgreArrayMatrixAf4x3NEON.inl b/...rray/NEON/Single/OgreArrayMatrixAf4x3.inl → .../NEON/Single/OgreArrayMatrixAf4x3NEON.inl
diff --git a/...h/Array/NEON/Single/OgreArrayQuaternion.h → ...ray/NEON/Single/OgreArrayQuaternionNEON.h b/...h/Array/NEON/Single/OgreArrayQuaternion.h → ...ray/NEON/Single/OgreArrayQuaternionNEON.h
@@ -256,6 +256,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayQuaternion.inl"
+#include "OgreArrayQuaternionNEON.inl"
 
 #endif
diff --git a/...Array/NEON/Single/OgreArrayQuaternion.inl → ...y/NEON/Single/OgreArrayQuaternionNEON.inl b/...Array/NEON/Single/OgreArrayQuaternion.inl → ...y/NEON/Single/OgreArrayQuaternionNEON.inl
diff --git a/.../Math/Array/NEON/Single/OgreArraySphere.h → ...h/Array/NEON/Single/OgreArraySphereNEON.h b/.../Math/Array/NEON/Single/OgreArraySphere.h → ...h/Array/NEON/Single/OgreArraySphereNEON.h
@@ -121,6 +121,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArraySphere.inl"
+#include "OgreArraySphereNEON.inl"
 
 #endif
diff --git a/...ath/Array/NEON/Single/OgreArraySphere.inl → ...Array/NEON/Single/OgreArraySphereNEON.inl b/...ath/Array/NEON/Single/OgreArraySphere.inl → ...Array/NEON/Single/OgreArraySphereNEON.inl
diff --git a/...Math/Array/NEON/Single/OgreArrayVector2.h → .../Array/NEON/Single/OgreArrayVector2NEON.h b/...Math/Array/NEON/Single/OgreArrayVector2.h → .../Array/NEON/Single/OgreArrayVector2NEON.h
@@ -341,6 +341,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayVector2.inl"
+#include "OgreArrayVector2NEON.inl"
 
 #endif
diff --git a/...th/Array/NEON/Single/OgreArrayVector2.inl → ...rray/NEON/Single/OgreArrayVector2NEON.inl b/...th/Array/NEON/Single/OgreArrayVector2.inl → ...rray/NEON/Single/OgreArrayVector2NEON.inl
diff --git a/...Math/Array/NEON/Single/OgreArrayVector3.h → .../Array/NEON/Single/OgreArrayVector3NEON.h b/...Math/Array/NEON/Single/OgreArrayVector3.h → .../Array/NEON/Single/OgreArrayVector3NEON.h
@@ -375,6 +375,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayVector3.inl"
+#include "OgreArrayVector3NEON.inl"
 
 #endif
diff --git a/...th/Array/NEON/Single/OgreArrayVector3.inl → ...rray/NEON/Single/OgreArrayVector3NEON.inl b/...th/Array/NEON/Single/OgreArrayVector3.inl → ...rray/NEON/Single/OgreArrayVector3NEON.inl
diff --git a/...Math/Array/NEON/Single/OgreArrayVector4.h → .../Array/NEON/Single/OgreArrayVector4NEON.h b/...Math/Array/NEON/Single/OgreArrayVector4.h → .../Array/NEON/Single/OgreArrayVector4NEON.h
@@ -287,6 +287,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayVector4.inl"
+#include "OgreArrayVector4NEON.inl"
 
 #endif
diff --git a/...th/Array/NEON/Single/OgreArrayVector4.inl → ...rray/NEON/Single/OgreArrayVector4NEON.inl b/...th/Array/NEON/Single/OgreArrayVector4.inl → ...rray/NEON/Single/OgreArrayVector4NEON.inl
diff --git a/.../Math/Array/NEON/Single/OgreBooleanMask.h → ...h/Array/NEON/Single/OgreBooleanMaskNEON.h b/.../Math/Array/NEON/Single/OgreBooleanMask.h → ...h/Array/NEON/Single/OgreBooleanMaskNEON.h
@@ -90,6 +90,6 @@ namespace Ogre
     };
 }  // namespace Ogre
 
-#include "OgreBooleanMask.inl"
+#include "OgreBooleanMaskNEON.inl"
 
 #endif
diff --git a/...ath/Array/NEON/Single/OgreBooleanMask.inl → ...Array/NEON/Single/OgreBooleanMaskNEON.inl b/...ath/Array/NEON/Single/OgreBooleanMask.inl → ...Array/NEON/Single/OgreBooleanMaskNEON.inl
diff --git a/OgreMain/include/Math/Array/OgreArrayAabb.h b/OgreMain/include/Math/Array/OgreArrayAabb.h
@@ -33,18 +33,18 @@ THE SOFTWARE.
 
 #if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
-#        include "SSE2/Double/OgreArrayAabb.h"
+#        include "SSE2/Double/OgreArrayAabbSSE2.h"
 #    else
-#        include "SSE2/Single/OgreArrayAabb.h"
+#        include "SSE2/Single/OgreArrayAabbSSE2.h"
 #    endif
 #elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
 #        error Double precision with SIMD on ARM is not supported
 #    else
-#        include "NEON/Single/OgreArrayAabb.h"
+#        include "NEON/Single/OgreArrayAabbNEON.h"
 #    endif
 #else
-#    include "C/OgreArrayAabb.h"
+#    include "C/OgreArrayAabbC.h"
 #endif
 
 #endif
diff --git a/OgreMain/include/Math/Array/OgreArrayMatrix4.h b/OgreMain/include/Math/Array/OgreArrayMatrix4.h
@@ -33,18 +33,18 @@ THE SOFTWARE.
 
 #if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
-#        include "SSE2/Double/OgreArrayMatrix4.h"
+#        include "SSE2/Double/OgreArrayMatrix4SSE2.h"
 #    else
-#        include "SSE2/Single/OgreArrayMatrix4.h"
+#        include "SSE2/Single/OgreArrayMatrix4SSE2.h"
 #    endif
 #elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
 #        error Double precision with SIMD on ARM is not supported
 #    else
-#        include "NEON/Single/OgreArrayMatrix4.h"
+#        include "NEON/Single/OgreArrayMatrix4NEON.h"
 #    endif
 #else
-#    include "C/OgreArrayMatrix4.h"
+#    include "C/OgreArrayMatrix4C.h"
 #endif
 
 #endif
diff --git a/OgreMain/include/Math/Array/OgreArrayMatrixAf4x3.h b/OgreMain/include/Math/Array/OgreArrayMatrixAf4x3.h
@@ -33,18 +33,18 @@ THE SOFTWARE.
 
 #if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
-#        include "SSE2/Double/OgreArrayMatrixAf4x3.h"
+#        include "SSE2/Double/OgreArrayMatrixAf4x3SSE2.h"
 #    else
-#        include "SSE2/Single/OgreArrayMatrixAf4x3.h"
+#        include "SSE2/Single/OgreArrayMatrixAf4x3SSE2.h"
 #    endif
 #elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
 #        error Double precision with SIMD on ARM is not supported
 #    else
-#        include "NEON/Single/OgreArrayMatrixAf4x3.h"
+#        include "NEON/Single/OgreArrayMatrixAf4x3NEON.h"
 #    endif
 #else
-#    include "C/OgreArrayMatrixAf4x3.h"
+#    include "C/OgreArrayMatrixAf4x3C.h"
 #endif
 
 #endif
diff --git a/OgreMain/include/Math/Array/OgreArrayQuaternion.h b/OgreMain/include/Math/Array/OgreArrayQuaternion.h
@@ -33,18 +33,18 @@ THE SOFTWARE.
 
 #if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
-#        include "SSE2/Double/OgreArrayQuaternion.h"
+#        include "SSE2/Double/OgreArrayQuaternionSSE2.h"
 #    else
-#        include "SSE2/Single/OgreArrayQuaternion.h"
+#        include "SSE2/Single/OgreArrayQuaternionSSE2.h"
 #    endif
 #elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
 #        error Double precision with SIMD on ARM is not supported
 #    else
-#        include "NEON/Single/OgreArrayQuaternion.h"
+#        include "NEON/Single/OgreArrayQuaternionNEON.h"
 #    endif
 #else
-#    include "C/OgreArrayQuaternion.h"
+#    include "C/OgreArrayQuaternionC.h"
 #endif
 
 #endif
diff --git a/OgreMain/include/Math/Array/OgreArraySphere.h b/OgreMain/include/Math/Array/OgreArraySphere.h
@@ -33,18 +33,18 @@ THE SOFTWARE.
 
 #if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
-#        include "SSE2/Double/OgreArraySphere.h"
+#        include "SSE2/Double/OgreArraySphereSSE2.h"
 #    else
-#        include "SSE2/Single/OgreArraySphere.h"
+#        include "SSE2/Single/OgreArraySphereSSE2.h"
 #    endif
 #elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
 #        error Double precision with SIMD on ARM is not supported
 #    else
-#        include "NEON/Single/OgreArraySphere.h"
+#        include "NEON/Single/OgreArraySphereNEON.h"
 #    endif
 #else
-#    include "C/OgreArraySphere.h"
+#    include "C/OgreArraySphereC.h"
 #endif
 
 #endif
diff --git a/OgreMain/include/Math/Array/OgreArrayVector2.h b/OgreMain/include/Math/Array/OgreArrayVector2.h
@@ -33,18 +33,18 @@ THE SOFTWARE.
 
 #if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
-#        include "SSE2/Double/OgreArrayVector2.h"
+#        include "SSE2/Double/OgreArrayVector2SSE2.h"
 #    else
-#        include "SSE2/Single/OgreArrayVector2.h"
+#        include "SSE2/Single/OgreArrayVector2SSE2.h"
 #    endif
 #elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
 #        error Double precision with SIMD on ARM is not supported
 #    else
-#        include "NEON/Single/OgreArrayVector2.h"
+#        include "NEON/Single/OgreArrayVector2NEON.h"
 #    endif
 #else
-#    include "C/OgreArrayVector2.h"
+#    include "C/OgreArrayVector2C.h"
 #endif
 
 #endif
diff --git a/OgreMain/include/Math/Array/OgreArrayVector3.h b/OgreMain/include/Math/Array/OgreArrayVector3.h
@@ -33,18 +33,18 @@ THE SOFTWARE.
 
 #if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
-#        include "SSE2/Double/OgreArrayVector3.h"
+#        include "SSE2/Double/OgreArrayVector3SSE2.h"
 #    else
-#        include "SSE2/Single/OgreArrayVector3.h"
+#        include "SSE2/Single/OgreArrayVector3SSE2.h"
 #    endif
 #elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
 #        error Double precision with SIMD on ARM is not supported
 #    else
-#        include "NEON/Single/OgreArrayVector3.h"
+#        include "NEON/Single/OgreArrayVector3NEON.h"
 #    endif
 #else
-#    include "C/OgreArrayVector3.h"
+#    include "C/OgreArrayVector3C.h"
 #endif
 
 #endif
diff --git a/OgreMain/include/Math/Array/OgreArrayVector4.h b/OgreMain/include/Math/Array/OgreArrayVector4.h
@@ -33,18 +33,18 @@ THE SOFTWARE.
 
 #if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
-#        include "SSE2/Double/OgreArrayVector4.h"
+#        include "SSE2/Double/OgreArrayVector4SSE2.h"
 #    else
-#        include "SSE2/Single/OgreArrayVector4.h"
+#        include "SSE2/Single/OgreArrayVector4SSE2.h"
 #    endif
 #elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
 #        error Double precision with SIMD on ARM is not supported
 #    else
-#        include "NEON/Single/OgreArrayVector4.h"
+#        include "NEON/Single/OgreArrayVector4NEON.h"
 #    endif
 #else
-#    include "C/OgreArrayVector4.h"
+#    include "C/OgreArrayVector4C.h"
 #endif
 
 #endif
diff --git a/OgreMain/include/Math/Array/OgreBooleanMask.h b/OgreMain/include/Math/Array/OgreBooleanMask.h
@@ -33,18 +33,18 @@ THE SOFTWARE.
 
 #if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
-#        include "SSE2/Double/OgreBooleanMask.h"
+#        include "SSE2/Double/OgreBooleanMaskSSE2.h"
 #    else
-#        include "SSE2/Single/OgreBooleanMask.h"
+#        include "SSE2/Single/OgreBooleanMaskSSE2.h"
 #    endif
 #elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
 #        error Double precision with SIMD on ARM is not supported
 #    else
-#        include "NEON/Single/OgreBooleanMask.h"
+#        include "NEON/Single/OgreBooleanMaskNEON.h"
 #    endif
 #else
-#    include "C/OgreBooleanMask.h"
+#    include "C/OgreBooleanMaskC.h"
 #endif
 
 #endif
diff --git a/...de/Math/Array/SSE2/Single/OgreArrayAabb.h → ...ath/Array/SSE2/Single/OgreArrayAabbSSE2.h b/...de/Math/Array/SSE2/Single/OgreArrayAabb.h → ...ath/Array/SSE2/Single/OgreArrayAabbSSE2.h
@@ -177,6 +177,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayAabb.inl"
+#include "OgreArrayAabbSSE2.inl"
 
 #endif
diff --git a/.../Math/Array/SSE2/Single/OgreArrayAabb.inl → ...h/Array/SSE2/Single/OgreArrayAabbSSE2.inl b/.../Math/Array/SSE2/Single/OgreArrayAabb.inl → ...h/Array/SSE2/Single/OgreArrayAabbSSE2.inl
diff --git a/...Math/Array/SSE2/Single/OgreArrayMatrix4.h → .../Array/SSE2/Single/OgreArrayMatrix4SSE2.h b/...Math/Array/SSE2/Single/OgreArrayMatrix4.h → .../Array/SSE2/Single/OgreArrayMatrix4SSE2.h
@@ -238,6 +238,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayMatrix4.inl"
+#include "OgreArrayMatrix4SSE2.inl"
 
 #endif
diff --git a/...th/Array/SSE2/Single/OgreArrayMatrix4.inl → ...rray/SSE2/Single/OgreArrayMatrix4SSE2.inl b/...th/Array/SSE2/Single/OgreArrayMatrix4.inl → ...rray/SSE2/Single/OgreArrayMatrix4SSE2.inl
diff --git a/.../Array/SSE2/Single/OgreArrayMatrixAf4x3.h → ...ay/SSE2/Single/OgreArrayMatrixAf4x3SSE2.h b/.../Array/SSE2/Single/OgreArrayMatrixAf4x3.h → ...ay/SSE2/Single/OgreArrayMatrixAf4x3SSE2.h
@@ -247,6 +247,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayMatrixAf4x3.inl"
+#include "OgreArrayMatrixAf4x3SSE2.inl"
 
 #endif
diff --git a/...rray/SSE2/Single/OgreArrayMatrixAf4x3.inl → .../SSE2/Single/OgreArrayMatrixAf4x3SSE2.inl b/...rray/SSE2/Single/OgreArrayMatrixAf4x3.inl → .../SSE2/Single/OgreArrayMatrixAf4x3SSE2.inl
diff --git a/...h/Array/SSE2/Single/OgreArrayQuaternion.h → ...ray/SSE2/Single/OgreArrayQuaternionSSE2.h b/...h/Array/SSE2/Single/OgreArrayQuaternion.h → ...ray/SSE2/Single/OgreArrayQuaternionSSE2.h
@@ -257,6 +257,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayQuaternion.inl"
+#include "OgreArrayQuaternionSSE2.inl"
 
 #endif
diff --git a/...Array/SSE2/Single/OgreArrayQuaternion.inl → ...y/SSE2/Single/OgreArrayQuaternionSSE2.inl b/...Array/SSE2/Single/OgreArrayQuaternion.inl → ...y/SSE2/Single/OgreArrayQuaternionSSE2.inl
diff --git a/.../Math/Array/SSE2/Single/OgreArraySphere.h → ...h/Array/SSE2/Single/OgreArraySphereSSE2.h b/.../Math/Array/SSE2/Single/OgreArraySphere.h → ...h/Array/SSE2/Single/OgreArraySphereSSE2.h
@@ -121,6 +121,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArraySphere.inl"
+#include "OgreArraySphereSSE2.inl"
 
 #endif
diff --git a/...ath/Array/SSE2/Single/OgreArraySphere.inl → ...Array/SSE2/Single/OgreArraySphereSSE2.inl b/...ath/Array/SSE2/Single/OgreArraySphere.inl → ...Array/SSE2/Single/OgreArraySphereSSE2.inl
diff --git a/...Math/Array/SSE2/Single/OgreArrayVector2.h → .../Array/SSE2/Single/OgreArrayVector2SSE2.h b/...Math/Array/SSE2/Single/OgreArrayVector2.h → .../Array/SSE2/Single/OgreArrayVector2SSE2.h
@@ -340,6 +340,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayVector2.inl"
+#include "OgreArrayVector2SSE2.inl"
 
 #endif
diff --git a/...th/Array/SSE2/Single/OgreArrayVector2.inl → ...rray/SSE2/Single/OgreArrayVector2SSE2.inl b/...th/Array/SSE2/Single/OgreArrayVector2.inl → ...rray/SSE2/Single/OgreArrayVector2SSE2.inl