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 · 75801f3 · 75801f3
1 parent 9dee005
commit 75801f3
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/OgreMain/include/Animation/OgreTagPoint.h → OgreMain/include/Animation/OgreTagPoint2.h b/OgreMain/include/Animation/OgreTagPoint.h → 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
@@ -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 → OgreMain/src/Animation/OgreTagPoint2.cpp b/OgreMain/src/Animation/OgreTagPoint.cpp → 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
@@ -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
@@ -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/.../ImportAnimationsShareSkeletonInstance/ImportAnimationsShareSkeletonInstanceGameState.cpp b/.../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
@@ -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"