Skip to content

Commit 67f9fdd

Browse files
author
Eugene Golushkov
committed
Avoid identically named source files - some build systems have problems with it, even if CMake have none (headermaps in XCode, shared intermediate folder in Visual Studio)
1 parent 75801f3 commit 67f9fdd

File tree

88 files changed

+88
-94
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+88
-94
lines changed

‎.github/workflows/run_clang_format.py

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -70,30 +70,30 @@
7070
'../../OgreMain/include/OgreHlmsDatablock.h': 3,
7171
'../../OgreMain/include/Animation/OgreBone.inl': 63,
7272
'../../OgreMain/include/Math/Array/OgreNodeMemoryManager.h': 3,
73-
'../../OgreMain/include/Math/Array/C/OgreArrayVector3.inl': 849,
74-
'../../OgreMain/include/Math/Array/C/OgreArraySphere.inl': 24,
75-
'../../OgreMain/include/Math/Array/C/OgreArrayMatrix4.inl': 528,
73+
'../../OgreMain/include/Math/Array/C/OgreArrayVector3C.inl': 849,
74+
'../../OgreMain/include/Math/Array/C/OgreArraySphereC.inl': 24,
75+
'../../OgreMain/include/Math/Array/C/OgreArrayMatrix4C.inl': 528,
7676
'../../OgreMain/include/Math/Array/C/OgreMathlibC.inl': 33,
77-
'../../OgreMain/include/Math/Array/C/OgreArrayAabb.inl': 114,
78-
'../../OgreMain/include/Math/Array/C/OgreBooleanMask.inl': 54,
79-
'../../OgreMain/include/Math/Array/C/OgreArrayQuaternion.inl': 699,
80-
'../../OgreMain/include/Math/Array/C/OgreArrayMatrixAf4x3.inl': 1053,
81-
'../../OgreMain/include/Math/Array/NEON/Single/OgreArrayVector3.inl': 1386,
82-
'../../OgreMain/include/Math/Array/NEON/Single/OgreArraySphere.inl': 30,
83-
'../../OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrix4.inl': 1419,
77+
'../../OgreMain/include/Math/Array/C/OgreArrayAabbC.inl': 114,
78+
'../../OgreMain/include/Math/Array/C/OgreBooleanMaskC.inl': 54,
79+
'../../OgreMain/include/Math/Array/C/OgreArrayQuaternionC.inl': 699,
80+
'../../OgreMain/include/Math/Array/C/OgreArrayMatrixAf4x3C.inl': 1053,
81+
'../../OgreMain/include/Math/Array/NEON/Single/OgreArrayVector3NEON.inl': 1386,
82+
'../../OgreMain/include/Math/Array/NEON/Single/OgreArraySphereNEON.inl': 30,
83+
'../../OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrix4NEON.inl': 1419,
8484
'../../OgreMain/include/Math/Array/NEON/Single/OgreMathlibNEON.h': 6,
8585
'../../OgreMain/include/Math/Array/NEON/Single/OgreMathlibNEON.inl': 408,
86-
'../../OgreMain/include/Math/Array/NEON/Single/OgreArrayAabb.inl': 216,
87-
'../../OgreMain/include/Math/Array/NEON/Single/OgreBooleanMask.inl': 141,
88-
'../../OgreMain/include/Math/Array/NEON/Single/OgreArrayQuaternion.inl': 1167,
89-
'../../OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3.inl': 1791,
90-
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector3.inl': 1239,
91-
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArraySphere.inl': 30,
92-
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrix4.inl': 1530,
93-
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayAabb.inl': 219,
94-
'../../OgreMain/include/Math/Array/SSE2/Single/OgreBooleanMask.inl': 126,
95-
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayQuaternion.inl': 1071,
96-
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrixAf4x3.inl': 1929,
86+
'../../OgreMain/include/Math/Array/NEON/Single/OgreArrayAabbNEON.inl': 216,
87+
'../../OgreMain/include/Math/Array/NEON/Single/OgreBooleanMaskNEON.inl': 141,
88+
'../../OgreMain/include/Math/Array/NEON/Single/OgreArrayQuaternionNEON.inl': 1167,
89+
'../../OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3NEON.inl': 1791,
90+
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector3SSE2.inl': 1239,
91+
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArraySphereSSE2.inl': 30,
92+
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrix4SSE2.inl': 1530,
93+
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayAabbSSE2.inl': 219,
94+
'../../OgreMain/include/Math/Array/SSE2/Single/OgreBooleanMaskSSE2.inl': 126,
95+
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayQuaternionSSE2.inl': 1071,
96+
'../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrixAf4x3SSE2.inl': 1929,
9797
'../../OgreMain/include/Compositor/OgreCompositorManager2.h': 3,
9898
'../../OgreMain/include/Compositor/Pass/OgreCompositorPassDef.h': 3,
9999
'../../OgreMain/src/OgrePlatformInformation.cpp': 2274,

‎OgreMain/include/Math/Array/C/OgreArrayAabb.h renamed to ‎OgreMain/include/Math/Array/C/OgreArrayAabbC.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,6 @@ namespace Ogre
177177

178178
} // namespace Ogre
179179

180-
#include "OgreArrayAabb.inl"
180+
#include "OgreArrayAabbC.inl"
181181

182182
#endif

‎OgreMain/include/Math/Array/C/OgreArrayAabb.inl renamed to ‎OgreMain/include/Math/Array/C/OgreArrayAabbC.inl

File renamed without changes.

‎OgreMain/include/Math/Array/C/OgreArrayMatrix4.h renamed to ‎OgreMain/include/Math/Array/C/OgreArrayMatrix4C.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,6 @@ namespace Ogre
250250

251251
} // namespace Ogre
252252

253-
#include "OgreArrayMatrix4.inl"
253+
#include "OgreArrayMatrix4C.inl"
254254

255255
#endif

‎OgreMain/include/Math/Array/C/OgreArrayMatrix4.inl renamed to ‎OgreMain/include/Math/Array/C/OgreArrayMatrix4C.inl

File renamed without changes.

‎OgreMain/include/Math/Array/C/OgreArrayMatrixAf4x3.h renamed to ‎OgreMain/include/Math/Array/C/OgreArrayMatrixAf4x3C.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,6 @@ namespace Ogre
274274

275275
} // namespace Ogre
276276

277-
#include "OgreArrayMatrixAf4x3.inl"
277+
#include "OgreArrayMatrixAf4x3C.inl"
278278

279279
#endif

‎OgreMain/include/Math/Array/C/OgreArrayMatrixAf4x3.inl renamed to ‎OgreMain/include/Math/Array/C/OgreArrayMatrixAf4x3C.inl

File renamed without changes.

‎OgreMain/include/Math/Array/C/OgreArrayQuaternion.h renamed to ‎OgreMain/include/Math/Array/C/OgreArrayQuaternionC.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ THE SOFTWARE.
3737
#include "Math/Array/OgreArrayVector3.h"
3838
#include "Math/Array/OgreMathlib.h"
3939

40-
#include "OgreArrayQuaternion.h"
41-
4240
namespace Ogre
4341
{
4442
/** \addtogroup Core
@@ -257,6 +255,6 @@ namespace Ogre
257255

258256
} // namespace Ogre
259257

260-
#include "OgreArrayQuaternion.inl"
258+
#include "OgreArrayQuaternionC.inl"
261259

262260
#endif

‎OgreMain/include/Math/Array/C/OgreArrayQuaternion.inl renamed to ‎OgreMain/include/Math/Array/C/OgreArrayQuaternionC.inl

File renamed without changes.

‎OgreMain/include/Math/Array/C/OgreArraySphere.h renamed to ‎OgreMain/include/Math/Array/C/OgreArraySphereC.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,6 @@ namespace Ogre
121121

122122
} // namespace Ogre
123123

124-
#include "OgreArraySphere.inl"
124+
#include "OgreArraySphereC.inl"
125125

126126
#endif

‎OgreMain/include/Math/Array/C/OgreArraySphere.inl renamed to ‎OgreMain/include/Math/Array/C/OgreArraySphereC.inl

File renamed without changes.

‎OgreMain/include/Math/Array/C/OgreArrayVector2.h renamed to ‎OgreMain/include/Math/Array/C/OgreArrayVector2C.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,6 @@ namespace Ogre
337337

338338
} // namespace Ogre
339339

340-
#include "OgreArrayVector2.inl"
340+
#include "OgreArrayVector2C.inl"
341341

342342
#endif

‎OgreMain/include/Math/Array/C/OgreArrayVector2.inl renamed to ‎OgreMain/include/Math/Array/C/OgreArrayVector2C.inl

File renamed without changes.

‎OgreMain/include/Math/Array/C/OgreArrayVector3.h renamed to ‎OgreMain/include/Math/Array/C/OgreArrayVector3C.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,6 @@ namespace Ogre
358358

359359
} // namespace Ogre
360360

361-
#include "OgreArrayVector3.inl"
361+
#include "OgreArrayVector3C.inl"
362362

363363
#endif

‎OgreMain/include/Math/Array/C/OgreArrayVector3.inl renamed to ‎OgreMain/include/Math/Array/C/OgreArrayVector3C.inl

File renamed without changes.

‎OgreMain/include/Math/Array/C/OgreArrayVector4.h renamed to ‎OgreMain/include/Math/Array/C/OgreArrayVector4C.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,6 @@ namespace Ogre
278278

279279
} // namespace Ogre
280280

281-
#include "OgreArrayVector4.inl"
281+
#include "OgreArrayVector4C.inl"
282282

283283
#endif

‎OgreMain/include/Math/Array/C/OgreArrayVector4.inl renamed to ‎OgreMain/include/Math/Array/C/OgreArrayVector4C.inl

File renamed without changes.

‎OgreMain/include/Math/Array/C/OgreBooleanMask.h renamed to ‎OgreMain/include/Math/Array/C/OgreBooleanMaskC.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,6 @@ namespace Ogre
6363
};
6464
} // namespace Ogre
6565

66-
#include "OgreBooleanMask.inl"
66+
#include "OgreBooleanMaskC.inl"
6767

6868
#endif

‎OgreMain/include/Math/Array/C/OgreBooleanMask.inl renamed to ‎OgreMain/include/Math/Array/C/OgreBooleanMaskC.inl

File renamed without changes.

‎OgreMain/include/Math/Array/NEON/Single/OgreArrayAabb.h renamed to ‎OgreMain/include/Math/Array/NEON/Single/OgreArrayAabbNEON.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,6 @@ namespace Ogre
177177

178178
} // namespace Ogre
179179

180-
#include "OgreArrayAabb.inl"
180+
#include "OgreArrayAabbNEON.inl"
181181

182182
#endif

‎OgreMain/include/Math/Array/NEON/Single/OgreArrayAabb.inl renamed to ‎OgreMain/include/Math/Array/NEON/Single/OgreArrayAabbNEON.inl

File renamed without changes.

‎OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrix4.h renamed to ‎OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrix4NEON.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,6 @@ namespace Ogre
253253

254254
} // namespace Ogre
255255

256-
#include "OgreArrayMatrix4.inl"
256+
#include "OgreArrayMatrix4NEON.inl"
257257

258258
#endif

‎OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrix4.inl renamed to ‎OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrix4NEON.inl

File renamed without changes.

‎OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3.h renamed to ‎OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3NEON.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,6 @@ namespace Ogre
247247

248248
} // namespace Ogre
249249

250-
#include "OgreArrayMatrixAf4x3.inl"
250+
#include "OgreArrayMatrixAf4x3NEON.inl"
251251

252252
#endif

‎OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3.inl renamed to ‎OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3NEON.inl

File renamed without changes.

‎OgreMain/include/Math/Array/NEON/Single/OgreArrayQuaternion.h renamed to ‎OgreMain/include/Math/Array/NEON/Single/OgreArrayQuaternionNEON.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ THE SOFTWARE.
3737
#include "Math/Array/OgreArrayVector3.h"
3838
#include "Math/Array/OgreMathlib.h"
3939

40-
#include "OgreArrayQuaternion.h"
41-
4240
namespace Ogre
4341
{
4442
/** \addtogroup Core
@@ -256,6 +254,6 @@ namespace Ogre
256254

257255
} // namespace Ogre
258256

259-
#include "OgreArrayQuaternion.inl"
257+
#include "OgreArrayQuaternionNEON.inl"
260258

261259
#endif

‎OgreMain/include/Math/Array/NEON/Single/OgreArrayQuaternion.inl renamed to ‎OgreMain/include/Math/Array/NEON/Single/OgreArrayQuaternionNEON.inl

File renamed without changes.

‎OgreMain/include/Math/Array/NEON/Single/OgreArraySphere.h renamed to ‎OgreMain/include/Math/Array/NEON/Single/OgreArraySphereNEON.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,6 @@ namespace Ogre
121121

122122
} // namespace Ogre
123123

124-
#include "OgreArraySphere.inl"
124+
#include "OgreArraySphereNEON.inl"
125125

126126
#endif

‎OgreMain/include/Math/Array/NEON/Single/OgreArraySphere.inl renamed to ‎OgreMain/include/Math/Array/NEON/Single/OgreArraySphereNEON.inl

File renamed without changes.

‎OgreMain/include/Math/Array/NEON/Single/OgreArrayVector2.h renamed to ‎OgreMain/include/Math/Array/NEON/Single/OgreArrayVector2NEON.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,6 @@ namespace Ogre
341341

342342
} // namespace Ogre
343343

344-
#include "OgreArrayVector2.inl"
344+
#include "OgreArrayVector2NEON.inl"
345345

346346
#endif

‎OgreMain/include/Math/Array/NEON/Single/OgreArrayVector2.inl renamed to ‎OgreMain/include/Math/Array/NEON/Single/OgreArrayVector2NEON.inl

File renamed without changes.

‎OgreMain/include/Math/Array/NEON/Single/OgreArrayVector3.h renamed to ‎OgreMain/include/Math/Array/NEON/Single/OgreArrayVector3NEON.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,6 @@ namespace Ogre
375375

376376
} // namespace Ogre
377377

378-
#include "OgreArrayVector3.inl"
378+
#include "OgreArrayVector3NEON.inl"
379379

380380
#endif

‎OgreMain/include/Math/Array/NEON/Single/OgreArrayVector3.inl renamed to ‎OgreMain/include/Math/Array/NEON/Single/OgreArrayVector3NEON.inl

File renamed without changes.

‎OgreMain/include/Math/Array/NEON/Single/OgreArrayVector4.h renamed to ‎OgreMain/include/Math/Array/NEON/Single/OgreArrayVector4NEON.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,6 @@ namespace Ogre
287287

288288
} // namespace Ogre
289289

290-
#include "OgreArrayVector4.inl"
290+
#include "OgreArrayVector4NEON.inl"
291291

292292
#endif

‎OgreMain/include/Math/Array/NEON/Single/OgreArrayVector4.inl renamed to ‎OgreMain/include/Math/Array/NEON/Single/OgreArrayVector4NEON.inl

File renamed without changes.

‎OgreMain/include/Math/Array/NEON/Single/OgreBooleanMask.h renamed to ‎OgreMain/include/Math/Array/NEON/Single/OgreBooleanMaskNEON.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,6 @@ namespace Ogre
9090
};
9191
} // namespace Ogre
9292

93-
#include "OgreBooleanMask.inl"
93+
#include "OgreBooleanMaskNEON.inl"
9494

9595
#endif

‎OgreMain/include/Math/Array/NEON/Single/OgreBooleanMask.inl renamed to ‎OgreMain/include/Math/Array/NEON/Single/OgreBooleanMaskNEON.inl

File renamed without changes.

‎OgreMain/include/Math/Array/OgreArrayAabb.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ THE SOFTWARE.
3333

3434
#if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
3535
# if OGRE_DOUBLE_PRECISION == 1
36-
# include "SSE2/Double/OgreArrayAabb.h"
36+
# include "SSE2/Double/OgreArrayAabbSSE2.h"
3737
# else
38-
# include "SSE2/Single/OgreArrayAabb.h"
38+
# include "SSE2/Single/OgreArrayAabbSSE2.h"
3939
# endif
4040
#elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
4141
# if OGRE_DOUBLE_PRECISION == 1
4242
# error Double precision with SIMD on ARM is not supported
4343
# else
44-
# include "NEON/Single/OgreArrayAabb.h"
44+
# include "NEON/Single/OgreArrayAabbNEON.h"
4545
# endif
4646
#else
47-
# include "C/OgreArrayAabb.h"
47+
# include "C/OgreArrayAabbC.h"
4848
#endif
4949

5050
#endif

‎OgreMain/include/Math/Array/OgreArrayMatrix4.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ THE SOFTWARE.
3333

3434
#if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
3535
# if OGRE_DOUBLE_PRECISION == 1
36-
# include "SSE2/Double/OgreArrayMatrix4.h"
36+
# include "SSE2/Double/OgreArrayMatrix4SSE2.h"
3737
# else
38-
# include "SSE2/Single/OgreArrayMatrix4.h"
38+
# include "SSE2/Single/OgreArrayMatrix4SSE2.h"
3939
# endif
4040
#elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
4141
# if OGRE_DOUBLE_PRECISION == 1
4242
# error Double precision with SIMD on ARM is not supported
4343
# else
44-
# include "NEON/Single/OgreArrayMatrix4.h"
44+
# include "NEON/Single/OgreArrayMatrix4NEON.h"
4545
# endif
4646
#else
47-
# include "C/OgreArrayMatrix4.h"
47+
# include "C/OgreArrayMatrix4C.h"
4848
#endif
4949

5050
#endif

‎OgreMain/include/Math/Array/OgreArrayMatrixAf4x3.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ THE SOFTWARE.
3333

3434
#if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
3535
# if OGRE_DOUBLE_PRECISION == 1
36-
# include "SSE2/Double/OgreArrayMatrixAf4x3.h"
36+
# include "SSE2/Double/OgreArrayMatrixAf4x3SSE2.h"
3737
# else
38-
# include "SSE2/Single/OgreArrayMatrixAf4x3.h"
38+
# include "SSE2/Single/OgreArrayMatrixAf4x3SSE2.h"
3939
# endif
4040
#elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
4141
# if OGRE_DOUBLE_PRECISION == 1
4242
# error Double precision with SIMD on ARM is not supported
4343
# else
44-
# include "NEON/Single/OgreArrayMatrixAf4x3.h"
44+
# include "NEON/Single/OgreArrayMatrixAf4x3NEON.h"
4545
# endif
4646
#else
47-
# include "C/OgreArrayMatrixAf4x3.h"
47+
# include "C/OgreArrayMatrixAf4x3C.h"
4848
#endif
4949

5050
#endif

‎OgreMain/include/Math/Array/OgreArrayQuaternion.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ THE SOFTWARE.
3333

3434
#if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
3535
# if OGRE_DOUBLE_PRECISION == 1
36-
# include "SSE2/Double/OgreArrayQuaternion.h"
36+
# include "SSE2/Double/OgreArrayQuaternionSSE2.h"
3737
# else
38-
# include "SSE2/Single/OgreArrayQuaternion.h"
38+
# include "SSE2/Single/OgreArrayQuaternionSSE2.h"
3939
# endif
4040
#elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
4141
# if OGRE_DOUBLE_PRECISION == 1
4242
# error Double precision with SIMD on ARM is not supported
4343
# else
44-
# include "NEON/Single/OgreArrayQuaternion.h"
44+
# include "NEON/Single/OgreArrayQuaternionNEON.h"
4545
# endif
4646
#else
47-
# include "C/OgreArrayQuaternion.h"
47+
# include "C/OgreArrayQuaternionC.h"
4848
#endif
4949

5050
#endif

‎OgreMain/include/Math/Array/OgreArraySphere.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ THE SOFTWARE.
3333

3434
#if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
3535
# if OGRE_DOUBLE_PRECISION == 1
36-
# include "SSE2/Double/OgreArraySphere.h"
36+
# include "SSE2/Double/OgreArraySphereSSE2.h"
3737
# else
38-
# include "SSE2/Single/OgreArraySphere.h"
38+
# include "SSE2/Single/OgreArraySphereSSE2.h"
3939
# endif
4040
#elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
4141
# if OGRE_DOUBLE_PRECISION == 1
4242
# error Double precision with SIMD on ARM is not supported
4343
# else
44-
# include "NEON/Single/OgreArraySphere.h"
44+
# include "NEON/Single/OgreArraySphereNEON.h"
4545
# endif
4646
#else
47-
# include "C/OgreArraySphere.h"
47+
# include "C/OgreArraySphereC.h"
4848
#endif
4949

5050
#endif

‎OgreMain/include/Math/Array/OgreArrayVector2.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ THE SOFTWARE.
3333

3434
#if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
3535
# if OGRE_DOUBLE_PRECISION == 1
36-
# include "SSE2/Double/OgreArrayVector2.h"
36+
# include "SSE2/Double/OgreArrayVector2SSE2.h"
3737
# else
38-
# include "SSE2/Single/OgreArrayVector2.h"
38+
# include "SSE2/Single/OgreArrayVector2SSE2.h"
3939
# endif
4040
#elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
4141
# if OGRE_DOUBLE_PRECISION == 1
4242
# error Double precision with SIMD on ARM is not supported
4343
# else
44-
# include "NEON/Single/OgreArrayVector2.h"
44+
# include "NEON/Single/OgreArrayVector2NEON.h"
4545
# endif
4646
#else
47-
# include "C/OgreArrayVector2.h"
47+
# include "C/OgreArrayVector2C.h"
4848
#endif
4949

5050
#endif

‎OgreMain/include/Math/Array/OgreArrayVector3.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ THE SOFTWARE.
3333

3434
#if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
3535
# if OGRE_DOUBLE_PRECISION == 1
36-
# include "SSE2/Double/OgreArrayVector3.h"
36+
# include "SSE2/Double/OgreArrayVector3SSE2.h"
3737
# else
38-
# include "SSE2/Single/OgreArrayVector3.h"
38+
# include "SSE2/Single/OgreArrayVector3SSE2.h"
3939
# endif
4040
#elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
4141
# if OGRE_DOUBLE_PRECISION == 1
4242
# error Double precision with SIMD on ARM is not supported
4343
# else
44-
# include "NEON/Single/OgreArrayVector3.h"
44+
# include "NEON/Single/OgreArrayVector3NEON.h"
4545
# endif
4646
#else
47-
# include "C/OgreArrayVector3.h"
47+
# include "C/OgreArrayVector3C.h"
4848
#endif
4949

5050
#endif

‎OgreMain/include/Math/Array/OgreArrayVector4.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ THE SOFTWARE.
3333

3434
#if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
3535
# if OGRE_DOUBLE_PRECISION == 1
36-
# include "SSE2/Double/OgreArrayVector4.h"
36+
# include "SSE2/Double/OgreArrayVector4SSE2.h"
3737
# else
38-
# include "SSE2/Single/OgreArrayVector4.h"
38+
# include "SSE2/Single/OgreArrayVector4SSE2.h"
3939
# endif
4040
#elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
4141
# if OGRE_DOUBLE_PRECISION == 1
4242
# error Double precision with SIMD on ARM is not supported
4343
# else
44-
# include "NEON/Single/OgreArrayVector4.h"
44+
# include "NEON/Single/OgreArrayVector4NEON.h"
4545
# endif
4646
#else
47-
# include "C/OgreArrayVector4.h"
47+
# include "C/OgreArrayVector4C.h"
4848
#endif
4949

5050
#endif

0 commit comments

Comments
 (0)