Skip to content

Commit

Permalink
Avoid identically named source files - some build systems have proble…
Browse files Browse the repository at this point in the history
…ms with it, even if CMake have none (headermaps in XCode, shared intermediate folder in Visual Studio)
  • Loading branch information
Eugene Golushkov committed Dec 18, 2024
1 parent 75801f3 commit a3c7671
Show file tree
Hide file tree
Showing 74 changed files with 88 additions and 94 deletions.
42 changes: 21 additions & 21 deletions .github/workflows/run_clang_format.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,30 +70,30 @@
'../../OgreMain/include/OgreHlmsDatablock.h': 3,
'../../OgreMain/include/Animation/OgreBone.inl': 63,
'../../OgreMain/include/Math/Array/OgreNodeMemoryManager.h': 3,
'../../OgreMain/include/Math/Array/C/OgreArrayVector3.inl': 849,
'../../OgreMain/include/Math/Array/C/OgreArraySphere.inl': 24,
'../../OgreMain/include/Math/Array/C/OgreArrayMatrix4.inl': 528,
'../../OgreMain/include/Math/Array/C/OgreArrayVector3C.inl': 849,
'../../OgreMain/include/Math/Array/C/OgreArraySphereC.inl': 24,
'../../OgreMain/include/Math/Array/C/OgreArrayMatrix4C.inl': 528,
'../../OgreMain/include/Math/Array/C/OgreMathlibC.inl': 33,
'../../OgreMain/include/Math/Array/C/OgreArrayAabb.inl': 114,
'../../OgreMain/include/Math/Array/C/OgreBooleanMask.inl': 54,
'../../OgreMain/include/Math/Array/C/OgreArrayQuaternion.inl': 699,
'../../OgreMain/include/Math/Array/C/OgreArrayMatrixAf4x3.inl': 1053,
'../../OgreMain/include/Math/Array/NEON/Single/OgreArrayVector3.inl': 1386,
'../../OgreMain/include/Math/Array/NEON/Single/OgreArraySphere.inl': 30,
'../../OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrix4.inl': 1419,
'../../OgreMain/include/Math/Array/C/OgreArrayAabbC.inl': 114,
'../../OgreMain/include/Math/Array/C/OgreBooleanMaskC.inl': 54,
'../../OgreMain/include/Math/Array/C/OgreArrayQuaternionC.inl': 699,
'../../OgreMain/include/Math/Array/C/OgreArrayMatrixAf4x3C.inl': 1053,
'../../OgreMain/include/Math/Array/NEON/Single/OgreArrayVector3NEON.inl': 1386,
'../../OgreMain/include/Math/Array/NEON/Single/OgreArraySphereNEON.inl': 30,
'../../OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrix4NEON.inl': 1419,
'../../OgreMain/include/Math/Array/NEON/Single/OgreMathlibNEON.h': 6,
'../../OgreMain/include/Math/Array/NEON/Single/OgreMathlibNEON.inl': 408,
'../../OgreMain/include/Math/Array/NEON/Single/OgreArrayAabb.inl': 216,
'../../OgreMain/include/Math/Array/NEON/Single/OgreBooleanMask.inl': 141,
'../../OgreMain/include/Math/Array/NEON/Single/OgreArrayQuaternion.inl': 1167,
'../../OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3.inl': 1791,
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector3.inl': 1239,
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArraySphere.inl': 30,
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrix4.inl': 1530,
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayAabb.inl': 219,
'../../OgreMain/include/Math/Array/SSE2/Single/OgreBooleanMask.inl': 126,
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayQuaternion.inl': 1071,
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrixAf4x3.inl': 1929,
'../../OgreMain/include/Math/Array/NEON/Single/OgreArrayAabbNEON.inl': 216,
'../../OgreMain/include/Math/Array/NEON/Single/OgreBooleanMaskNEON.inl': 141,
'../../OgreMain/include/Math/Array/NEON/Single/OgreArrayQuaternionNEON.inl': 1167,
'../../OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3NEON.inl': 1791,
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector3SSE2.inl': 1239,
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArraySphereSSE2.inl': 30,
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrix4SSE2.inl': 1530,
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayAabbSSE2.inl': 219,
'../../OgreMain/include/Math/Array/SSE2/Single/OgreBooleanMaskSSE2.inl': 126,
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayQuaternionSSE2.inl': 1071,
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrixAf4x3SSE2.inl': 1929,
'../../OgreMain/include/Compositor/OgreCompositorManager2.h': 3,
'../../OgreMain/include/Compositor/Pass/OgreCompositorPassDef.h': 3,
'../../OgreMain/src/OgrePlatformInformation.cpp': 2274,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,6 @@ namespace Ogre

} // namespace Ogre

#include "OgreArrayAabb.inl"
#include "OgreArrayAabbC.inl"

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,6 @@ namespace Ogre

} // namespace Ogre

#include "OgreArrayMatrix4.inl"
#include "OgreArrayMatrix4C.inl"

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,6 @@ namespace Ogre

} // namespace Ogre

#include "OgreArrayMatrixAf4x3.inl"
#include "OgreArrayMatrixAf4x3C.inl"

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ THE SOFTWARE.
#include "Math/Array/OgreArrayVector3.h"
#include "Math/Array/OgreMathlib.h"

#include "OgreArrayQuaternion.h"

namespace Ogre
{
/** \addtogroup Core
Expand Down Expand Up @@ -257,6 +255,6 @@ namespace Ogre

} // namespace Ogre

#include "OgreArrayQuaternion.inl"
#include "OgreArrayQuaternionC.inl"

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,6 @@ namespace Ogre

} // namespace Ogre

#include "OgreArraySphere.inl"
#include "OgreArraySphereC.inl"

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,6 @@ namespace Ogre

} // namespace Ogre

#include "OgreArrayVector2.inl"
#include "OgreArrayVector2C.inl"

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,6 @@ namespace Ogre

} // namespace Ogre

#include "OgreArrayVector3.inl"
#include "OgreArrayVector3C.inl"

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,6 @@ namespace Ogre

} // namespace Ogre

#include "OgreArrayVector4.inl"
#include "OgreArrayVector4C.inl"

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@ namespace Ogre
};
} // namespace Ogre

#include "OgreBooleanMask.inl"
#include "OgreBooleanMaskC.inl"

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,6 @@ namespace Ogre

} // namespace Ogre

#include "OgreArrayAabb.inl"
#include "OgreArrayAabbNEON.inl"

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,6 @@ namespace Ogre

} // namespace Ogre

#include "OgreArrayMatrix4.inl"
#include "OgreArrayMatrix4NEON.inl"

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,6 @@ namespace Ogre

} // namespace Ogre

#include "OgreArrayMatrixAf4x3.inl"
#include "OgreArrayMatrixAf4x3NEON.inl"

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ THE SOFTWARE.
#include "Math/Array/OgreArrayVector3.h"
#include "Math/Array/OgreMathlib.h"

#include "OgreArrayQuaternion.h"

namespace Ogre
{
/** \addtogroup Core
Expand Down Expand Up @@ -256,6 +254,6 @@ namespace Ogre

} // namespace Ogre

#include "OgreArrayQuaternion.inl"
#include "OgreArrayQuaternionNEON.inl"

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,6 @@ namespace Ogre

} // namespace Ogre

#include "OgreArraySphere.inl"
#include "OgreArraySphereNEON.inl"

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,6 @@ namespace Ogre

} // namespace Ogre

#include "OgreArrayVector2.inl"
#include "OgreArrayVector2NEON.inl"

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,6 @@ namespace Ogre

} // namespace Ogre

#include "OgreArrayVector3.inl"
#include "OgreArrayVector3NEON.inl"

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,6 @@ namespace Ogre

} // namespace Ogre

#include "OgreArrayVector4.inl"
#include "OgreArrayVector4NEON.inl"

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,6 @@ namespace Ogre
};
} // namespace Ogre

#include "OgreBooleanMask.inl"
#include "OgreBooleanMaskNEON.inl"

#endif
8 changes: 4 additions & 4 deletions OgreMain/include/Math/Array/OgreArrayAabb.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions OgreMain/include/Math/Array/OgreArrayMatrix4.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions OgreMain/include/Math/Array/OgreArrayMatrixAf4x3.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions OgreMain/include/Math/Array/OgreArrayQuaternion.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions OgreMain/include/Math/Array/OgreArraySphere.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions OgreMain/include/Math/Array/OgreArrayVector2.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions OgreMain/include/Math/Array/OgreArrayVector3.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions OgreMain/include/Math/Array/OgreArrayVector4.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading

0 comments on commit a3c7671

Please sign in to comment.