From 75801f33df72844384549b11de96b10421584bce Mon Sep 17 00:00:00 2001 From: Eugene Golushkov Date: Wed, 18 Dec 2024 22:15:53 +0100 Subject: [PATCH] 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) --- .../include/Animation/{OgreTagPoint.h => OgreTagPoint2.h} | 4 ++-- OgreMain/src/Animation/OgreBone.cpp | 2 +- .../src/Animation/{OgreTagPoint.cpp => OgreTagPoint2.cpp} | 2 +- OgreMain/src/OgreSceneManager.cpp | 2 +- .../ApiUsage/AnimationTagPoint/AnimationTagPointGameState.cpp | 2 +- .../ImportAnimationsShareSkeletonInstanceGameState.cpp | 2 +- .../2.0/ApiUsage/MorphAnimations/MorphAnimationsGameState.cpp | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename OgreMain/include/Animation/{OgreTagPoint.h => OgreTagPoint2.h} (99%) rename OgreMain/src/Animation/{OgreTagPoint.cpp => OgreTagPoint2.cpp} (99%) diff --git a/OgreMain/include/Animation/OgreTagPoint.h b/OgreMain/include/Animation/OgreTagPoint2.h similarity index 99% rename from OgreMain/include/Animation/OgreTagPoint.h rename to OgreMain/include/Animation/OgreTagPoint2.h index cc6e18692e9..404469dbfb2 100644 --- a/OgreMain/include/Animation/OgreTagPoint.h +++ b/OgreMain/include/Animation/OgreTagPoint2.h @@ -25,8 +25,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ----------------------------------------------------------------------------- */ -#ifndef _OgreTagPoint_H_ -#define _OgreTagPoint_H_ +#ifndef _OgreTagPoint2_H_ +#define _OgreTagPoint2_H_ #include "OgreSceneNode.h" diff --git a/OgreMain/src/Animation/OgreBone.cpp b/OgreMain/src/Animation/OgreBone.cpp index 36e97b68861..8e4126f1bc4 100644 --- a/OgreMain/src/Animation/OgreBone.cpp +++ b/OgreMain/src/Animation/OgreBone.cpp @@ -29,7 +29,7 @@ THE SOFTWARE. #include "Animation/OgreBone.h" -#include "Animation/OgreTagPoint.h" +#include "Animation/OgreTagPoint2.h" #include "Math/Array/OgreBoneMemoryManager.h" #include "Math/Array/OgreBooleanMask.h" #include "Math/Array/OgreKfTransform.h" diff --git a/OgreMain/src/Animation/OgreTagPoint.cpp b/OgreMain/src/Animation/OgreTagPoint2.cpp similarity index 99% rename from OgreMain/src/Animation/OgreTagPoint.cpp rename to OgreMain/src/Animation/OgreTagPoint2.cpp index 8c31673fc68..92800792c09 100644 --- a/OgreMain/src/Animation/OgreTagPoint.cpp +++ b/OgreMain/src/Animation/OgreTagPoint2.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. */ #include "OgreStableHeaders.h" -#include "Animation/OgreTagPoint.h" +#include "Animation/OgreTagPoint2.h" #include "Animation/OgreBone.h" #include "Math/Array/OgreBooleanMask.h" diff --git a/OgreMain/src/OgreSceneManager.cpp b/OgreMain/src/OgreSceneManager.cpp index 372d41235a0..7678c3e0dce 100644 --- a/OgreMain/src/OgreSceneManager.cpp +++ b/OgreMain/src/OgreSceneManager.cpp @@ -31,7 +31,7 @@ THE SOFTWARE. #include "Animation/OgreSkeletonDef.h" #include "Animation/OgreSkeletonInstance.h" -#include "Animation/OgreTagPoint.h" +#include "Animation/OgreTagPoint2.h" #include "Compositor/OgreCompositorShadowNode.h" #include "Compositor/Pass/PassScene/OgreCompositorPassSceneDef.h" #include "Math/Array/OgreBooleanMask.h" diff --git a/Samples/2.0/ApiUsage/AnimationTagPoint/AnimationTagPointGameState.cpp b/Samples/2.0/ApiUsage/AnimationTagPoint/AnimationTagPointGameState.cpp index 4876e3e2ec4..38cb91ba1b8 100644 --- a/Samples/2.0/ApiUsage/AnimationTagPoint/AnimationTagPointGameState.cpp +++ b/Samples/2.0/ApiUsage/AnimationTagPoint/AnimationTagPointGameState.cpp @@ -12,7 +12,7 @@ #include "Animation/OgreSkeletonAnimation.h" #include "Animation/OgreSkeletonInstance.h" -#include "Animation/OgreTagPoint.h" +#include "Animation/OgreTagPoint2.h" #include "OgreCamera.h" diff --git a/Samples/2.0/ApiUsage/ImportAnimationsShareSkeletonInstance/ImportAnimationsShareSkeletonInstanceGameState.cpp b/Samples/2.0/ApiUsage/ImportAnimationsShareSkeletonInstance/ImportAnimationsShareSkeletonInstanceGameState.cpp index 5147ec8ef44..cf0c573815d 100644 --- a/Samples/2.0/ApiUsage/ImportAnimationsShareSkeletonInstance/ImportAnimationsShareSkeletonInstanceGameState.cpp +++ b/Samples/2.0/ApiUsage/ImportAnimationsShareSkeletonInstance/ImportAnimationsShareSkeletonInstanceGameState.cpp @@ -12,7 +12,7 @@ #include "Animation/OgreSkeletonAnimation.h" #include "Animation/OgreSkeletonInstance.h" -#include "Animation/OgreTagPoint.h" +#include "Animation/OgreTagPoint2.h" #include "OgreCamera.h" diff --git a/Samples/2.0/ApiUsage/MorphAnimations/MorphAnimationsGameState.cpp b/Samples/2.0/ApiUsage/MorphAnimations/MorphAnimationsGameState.cpp index 8a0e254f4cc..97b3d7ab8f1 100644 --- a/Samples/2.0/ApiUsage/MorphAnimations/MorphAnimationsGameState.cpp +++ b/Samples/2.0/ApiUsage/MorphAnimations/MorphAnimationsGameState.cpp @@ -12,7 +12,7 @@ #include "Animation/OgreSkeletonAnimation.h" #include "Animation/OgreSkeletonInstance.h" -#include "Animation/OgreTagPoint.h" +#include "Animation/OgreTagPoint2.h" #include "OgreHlmsPbs.h" #include "OgreHlmsPbsDatablock.h"