From 5297391a445f3dd593063b2ec61c1a0682aa0be9 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Wed, 10 Sep 2025 13:13:55 +0200 Subject: [PATCH] [cpp] More MSVC fixes --- spine-cpp/include/spine/BoneTimeline.h | 4 ++-- spine-cpp/include/spine/TransformConstraintData.h | 2 +- spine-cpp/src/spine/BoneTimeline.cpp | 5 +++++ spine-cpp/src/spine/TransformConstraintData.cpp | 8 ++++++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/spine-cpp/include/spine/BoneTimeline.h b/spine-cpp/include/spine/BoneTimeline.h index 77cfd2b3b..d2021c2fd 100644 --- a/spine-cpp/include/spine/BoneTimeline.h +++ b/spine-cpp/include/spine/BoneTimeline.h @@ -114,8 +114,8 @@ namespace spine { int _boneIndex; - static const int ENTRIES = 3; - static const int VALUE1 = 1, VALUE2 = 2; + static const int ENTRIES; + static const int VALUE1, VALUE2; }; } diff --git a/spine-cpp/include/spine/TransformConstraintData.h b/spine-cpp/include/spine/TransformConstraintData.h index 29817b9eb..095137a3c 100644 --- a/spine-cpp/include/spine/TransformConstraintData.h +++ b/spine-cpp/include/spine/TransformConstraintData.h @@ -246,7 +246,7 @@ namespace spine { class SP_API TransformConstraintData : public ConstraintDataGeneric { public: RTTI_DECL - static const int ROTATION = 0, X = 1, Y = 2, SCALEX = 3, SCALEY = 4, SHEARY = 5; + static const int ROTATION, X, Y, SCALEX, SCALEY, SHEARY; friend class SkeletonBinary; friend class SkeletonJson; friend class TransformConstraint; diff --git a/spine-cpp/src/spine/BoneTimeline.cpp b/spine-cpp/src/spine/BoneTimeline.cpp index fd325ec70..526f9b742 100644 --- a/spine-cpp/src/spine/BoneTimeline.cpp +++ b/spine-cpp/src/spine/BoneTimeline.cpp @@ -38,6 +38,11 @@ using namespace spine; +// Define static constants for BoneTimeline2 +const int BoneTimeline2::ENTRIES = 3; +const int BoneTimeline2::VALUE1 = 1; +const int BoneTimeline2::VALUE2 = 2; + RTTI_IMPL_NOPARENT(BoneTimeline) RTTI_IMPL_MULTI(BoneTimeline1, CurveTimeline1, BoneTimeline) diff --git a/spine-cpp/src/spine/TransformConstraintData.cpp b/spine-cpp/src/spine/TransformConstraintData.cpp index d0d96e78d..061113460 100644 --- a/spine-cpp/src/spine/TransformConstraintData.cpp +++ b/spine-cpp/src/spine/TransformConstraintData.cpp @@ -38,6 +38,14 @@ using namespace spine; +// Define static constants for TransformConstraintData +const int TransformConstraintData::ROTATION = 0; +const int TransformConstraintData::X = 1; +const int TransformConstraintData::Y = 2; +const int TransformConstraintData::SCALEX = 3; +const int TransformConstraintData::SCALEY = 4; +const int TransformConstraintData::SHEARY = 5; + RTTI_IMPL(TransformConstraintData, ConstraintData) RTTI_IMPL_NOPARENT(FromProperty) RTTI_IMPL_NOPARENT(ToProperty)