From 8bde2aeb543c7f51fd0224cd69ede246c719e6ea Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Wed, 10 Sep 2025 13:53:34 +0200 Subject: [PATCH] [cpp] Remove dll.h and SP_API --- spine-cpp/include/spine/Animation.h | 2 +- spine-cpp/include/spine/AnimationState.h | 10 ++-- spine-cpp/include/spine/AnimationStateData.h | 2 +- spine-cpp/include/spine/Array.h | 2 +- spine-cpp/include/spine/ArrayUtils.h | 2 +- spine-cpp/include/spine/Atlas.h | 6 +-- .../include/spine/AtlasAttachmentLoader.h | 2 +- spine-cpp/include/spine/Attachment.h | 2 +- spine-cpp/include/spine/AttachmentLoader.h | 2 +- spine-cpp/include/spine/AttachmentTimeline.h | 2 +- spine-cpp/include/spine/Bone.h | 2 +- spine-cpp/include/spine/BoneData.h | 2 +- spine-cpp/include/spine/BoneLocal.h | 2 +- spine-cpp/include/spine/BonePose.h | 2 +- spine-cpp/include/spine/BoneTimeline.h | 8 +-- .../include/spine/BoundingBoxAttachment.h | 2 +- spine-cpp/include/spine/ClippingAttachment.h | 2 +- spine-cpp/include/spine/Color.h | 2 +- spine-cpp/include/spine/ColorTimeline.h | 10 ++-- spine-cpp/include/spine/Constraint.h | 2 +- spine-cpp/include/spine/ConstraintData.h | 2 +- spine-cpp/include/spine/ConstraintTimeline.h | 4 +- spine-cpp/include/spine/ConstraintTimeline1.h | 2 +- spine-cpp/include/spine/CurveTimeline.h | 4 +- spine-cpp/include/spine/Debug.h | 8 +-- spine-cpp/include/spine/DeformTimeline.h | 2 +- spine-cpp/include/spine/DrawOrderTimeline.h | 2 +- spine-cpp/include/spine/Event.h | 2 +- spine-cpp/include/spine/EventData.h | 2 +- spine-cpp/include/spine/EventTimeline.h | 2 +- spine-cpp/include/spine/Extension.h | 6 +-- spine-cpp/include/spine/HasRendererObject.h | 4 +- spine-cpp/include/spine/HashMap.h | 2 +- spine-cpp/include/spine/IkConstraint.h | 2 +- spine-cpp/include/spine/IkConstraintData.h | 2 +- spine-cpp/include/spine/IkConstraintPose.h | 2 +- .../include/spine/IkConstraintTimeline.h | 2 +- spine-cpp/include/spine/InheritTimeline.h | 2 +- spine-cpp/include/spine/Json.h | 2 +- spine-cpp/include/spine/LinkedMesh.h | 2 +- spine-cpp/include/spine/MathUtil.h | 2 +- spine-cpp/include/spine/MeshAttachment.h | 2 +- spine-cpp/include/spine/PathAttachment.h | 2 +- spine-cpp/include/spine/PathConstraint.h | 2 +- spine-cpp/include/spine/PathConstraintData.h | 4 +- .../include/spine/PathConstraintMixTimeline.h | 2 +- spine-cpp/include/spine/PathConstraintPose.h | 2 +- .../spine/PathConstraintPositionTimeline.h | 2 +- .../spine/PathConstraintSpacingTimeline.h | 2 +- spine-cpp/include/spine/PhysicsConstraint.h | 2 +- .../include/spine/PhysicsConstraintData.h | 2 +- .../include/spine/PhysicsConstraintPose.h | 2 +- .../include/spine/PhysicsConstraintTimeline.h | 18 +++---- spine-cpp/include/spine/PointAttachment.h | 2 +- spine-cpp/include/spine/Pool.h | 2 +- spine-cpp/include/spine/Pose.h | 2 +- spine-cpp/include/spine/Posed.h | 2 +- spine-cpp/include/spine/PosedActive.h | 4 +- spine-cpp/include/spine/PosedData.h | 2 +- spine-cpp/include/spine/RTTI.h | 4 +- spine-cpp/include/spine/RegionAttachment.h | 2 +- spine-cpp/include/spine/RotateTimeline.h | 2 +- spine-cpp/include/spine/ScaleTimeline.h | 6 +-- spine-cpp/include/spine/Sequence.h | 2 +- spine-cpp/include/spine/SequenceTimeline.h | 2 +- spine-cpp/include/spine/ShearTimeline.h | 6 +-- spine-cpp/include/spine/Skeleton.h | 2 +- spine-cpp/include/spine/SkeletonBinary.h | 2 +- spine-cpp/include/spine/SkeletonBounds.h | 2 +- spine-cpp/include/spine/SkeletonClipping.h | 2 +- spine-cpp/include/spine/SkeletonData.h | 2 +- spine-cpp/include/spine/SkeletonJson.h | 2 +- spine-cpp/include/spine/SkeletonRenderer.h | 4 +- spine-cpp/include/spine/Skin.h | 8 +-- spine-cpp/include/spine/Slider.h | 2 +- spine-cpp/include/spine/SliderData.h | 2 +- spine-cpp/include/spine/SliderMixTimeline.h | 2 +- spine-cpp/include/spine/SliderPose.h | 2 +- spine-cpp/include/spine/SliderTimeline.h | 2 +- spine-cpp/include/spine/Slot.h | 2 +- spine-cpp/include/spine/SlotCurveTimeline.h | 2 +- spine-cpp/include/spine/SlotData.h | 2 +- spine-cpp/include/spine/SlotPose.h | 2 +- spine-cpp/include/spine/SlotTimeline.h | 4 +- spine-cpp/include/spine/SpineObject.h | 4 +- spine-cpp/include/spine/SpineString.h | 2 +- spine-cpp/include/spine/TextureLoader.h | 2 +- spine-cpp/include/spine/TextureRegion.h | 2 +- spine-cpp/include/spine/Timeline.h | 2 +- spine-cpp/include/spine/TransformConstraint.h | 2 +- .../include/spine/TransformConstraintData.h | 30 +++++------ .../include/spine/TransformConstraintPose.h | 2 +- .../spine/TransformConstraintTimeline.h | 2 +- spine-cpp/include/spine/TranslateTimeline.h | 6 +-- spine-cpp/include/spine/Triangulator.h | 2 +- spine-cpp/include/spine/Update.h | 4 +- spine-cpp/include/spine/VertexAttachment.h | 2 +- spine-cpp/include/spine/dll.h | 51 ------------------- spine-cpp/src/spine/SkeletonJson.cpp | 2 +- 99 files changed, 157 insertions(+), 208 deletions(-) delete mode 100644 spine-cpp/include/spine/dll.h diff --git a/spine-cpp/include/spine/Animation.h b/spine-cpp/include/spine/Animation.h index 362c538a4..6a0dfc047 100644 --- a/spine-cpp/include/spine/Animation.h +++ b/spine-cpp/include/spine/Animation.h @@ -49,7 +49,7 @@ namespace spine { class AnimationState; /// Stores a list of timelines to animate a skeleton's pose over time. - class SP_API Animation : public SpineObject { + class Animation : public SpineObject { friend class AnimationState; friend class TrackEntry; diff --git a/spine-cpp/include/spine/AnimationState.h b/spine-cpp/include/spine/AnimationState.h index f3083fd08..5049f178c 100644 --- a/spine-cpp/include/spine/AnimationState.h +++ b/spine-cpp/include/spine/AnimationState.h @@ -78,7 +78,7 @@ namespace spine { #endif /// Abstract class to inherit from to create a callback object - class SP_API AnimationStateListenerObject { + class AnimationStateListenerObject { public: AnimationStateListenerObject() {}; @@ -90,7 +90,7 @@ namespace spine { }; /// State for the playback of an animation - class SP_API TrackEntry : public SpineObject, public HasRendererObject { + class TrackEntry : public SpineObject, public HasRendererObject { friend class EventQueue; friend class AnimationState; @@ -360,7 +360,7 @@ namespace spine { void reset(); }; - class SP_API EventQueueEntry : public SpineObject { + class EventQueueEntry : public SpineObject { friend class EventQueue; public: @@ -371,7 +371,7 @@ namespace spine { EventQueueEntry(EventType eventType, TrackEntry *trackEntry, Event *event = NULL); }; - class SP_API EventQueue : public SpineObject { + class EventQueue : public SpineObject { friend class AnimationState; private: @@ -403,7 +403,7 @@ namespace spine { void drain(); }; - class SP_API AnimationState : public SpineObject, public HasRendererObject { + class AnimationState : public SpineObject, public HasRendererObject { friend class TrackEntry; friend class EventQueue; diff --git a/spine-cpp/include/spine/AnimationStateData.h b/spine-cpp/include/spine/AnimationStateData.h index 54b1d5a71..b846a08ff 100644 --- a/spine-cpp/include/spine/AnimationStateData.h +++ b/spine-cpp/include/spine/AnimationStateData.h @@ -42,7 +42,7 @@ namespace spine { class Animation; /// Stores mix (crossfade) durations to be applied when AnimationState animations are changed. - class SP_API AnimationStateData : public SpineObject { + class AnimationStateData : public SpineObject { friend class AnimationState; public: diff --git a/spine-cpp/include/spine/Array.h b/spine-cpp/include/spine/Array.h index 4f01d3431..fd4f046c4 100644 --- a/spine-cpp/include/spine/Array.h +++ b/spine-cpp/include/spine/Array.h @@ -37,7 +37,7 @@ namespace spine { template - class SP_API Array : public SpineObject { + class Array : public SpineObject { public: using size_type = size_t; using value_type = T; diff --git a/spine-cpp/include/spine/ArrayUtils.h b/spine-cpp/include/spine/ArrayUtils.h index 44b4323b1..6e86a524e 100644 --- a/spine-cpp/include/spine/ArrayUtils.h +++ b/spine-cpp/include/spine/ArrayUtils.h @@ -39,7 +39,7 @@ #include namespace spine { - class SP_API ArrayUtils : public SpineObject { + class ArrayUtils : public SpineObject { public: /// Finds an item by comparing each item's name. /// It is more efficient to cache the results of this method than to call it multiple times. diff --git a/spine-cpp/include/spine/Atlas.h b/spine-cpp/include/spine/Atlas.h index a359b7b3a..aab84eb2f 100644 --- a/spine-cpp/include/spine/Atlas.h +++ b/spine-cpp/include/spine/Atlas.h @@ -82,7 +82,7 @@ namespace spine { TextureWrap_Repeat }; - class SP_API AtlasPage : public SpineObject { + class AtlasPage : public SpineObject { public: String name; String texturePath; @@ -107,7 +107,7 @@ namespace spine { } }; - class SP_API AtlasRegion : public TextureRegion { + class AtlasRegion : public TextureRegion { friend class Atlas; friend class RegionAttachment; friend class MeshAttachment; @@ -242,7 +242,7 @@ namespace spine { class TextureLoader; - class SP_API Atlas : public SpineObject { + class Atlas : public SpineObject { public: Atlas(const String &path, TextureLoader *textureLoader, bool createTexture = true); diff --git a/spine-cpp/include/spine/AtlasAttachmentLoader.h b/spine-cpp/include/spine/AtlasAttachmentLoader.h index ab3f85886..f0a5ec839 100644 --- a/spine-cpp/include/spine/AtlasAttachmentLoader.h +++ b/spine-cpp/include/spine/AtlasAttachmentLoader.h @@ -44,7 +44,7 @@ namespace spine { /// /// See https://esotericsoftware.com/spine-loading-skeleton-data#JSON-and-binary-data Loading skeleton data in the /// Spine Runtimes Guide. - class SP_API AtlasAttachmentLoader : public AttachmentLoader { + class AtlasAttachmentLoader : public AttachmentLoader { public: explicit AtlasAttachmentLoader(Atlas &atlas); diff --git a/spine-cpp/include/spine/Attachment.h b/spine-cpp/include/spine/Attachment.h index 879c7b316..f0a089008 100644 --- a/spine-cpp/include/spine/Attachment.h +++ b/spine-cpp/include/spine/Attachment.h @@ -35,7 +35,7 @@ #include namespace spine { - class SP_API Attachment : public SpineObject { + class Attachment : public SpineObject { RTTI_DECL_NOPARENT public: diff --git a/spine-cpp/include/spine/AttachmentLoader.h b/spine-cpp/include/spine/AttachmentLoader.h index ff4ef9632..611fde2f4 100644 --- a/spine-cpp/include/spine/AttachmentLoader.h +++ b/spine-cpp/include/spine/AttachmentLoader.h @@ -53,7 +53,7 @@ namespace spine { class Sequence; - class SP_API AttachmentLoader : public SpineObject { + class AttachmentLoader : public SpineObject { public: AttachmentLoader(); diff --git a/spine-cpp/include/spine/AttachmentTimeline.h b/spine-cpp/include/spine/AttachmentTimeline.h index a32ed73db..8d6a42a5a 100644 --- a/spine-cpp/include/spine/AttachmentTimeline.h +++ b/spine-cpp/include/spine/AttachmentTimeline.h @@ -48,7 +48,7 @@ namespace spine { class Event; - class SP_API AttachmentTimeline : public Timeline, public SlotTimeline { + class AttachmentTimeline : public Timeline, public SlotTimeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/Bone.h b/spine-cpp/include/spine/Bone.h index 2e3695883..bd439488a 100644 --- a/spine-cpp/include/spine/Bone.h +++ b/spine-cpp/include/spine/Bone.h @@ -43,7 +43,7 @@ namespace spine { /// A bone has a local transform which is used to compute its world transform. A bone also has an applied transform, which is a /// local transform that can be applied to compute the world transform. The local transform and applied transform may differ if a /// constraint or application code modifies the world transform after it was computed from the local transform. - class SP_API Bone : public PosedGeneric, public PosedActive, public Update { + class Bone : public PosedGeneric, public PosedActive, public Update { friend class AnimationState; friend class RotateTimeline; friend class IkConstraint; diff --git a/spine-cpp/include/spine/BoneData.h b/spine-cpp/include/spine/BoneData.h index c8916b434..1532f238e 100644 --- a/spine-cpp/include/spine/BoneData.h +++ b/spine-cpp/include/spine/BoneData.h @@ -37,7 +37,7 @@ #include namespace spine { - class SP_API BoneData : public PosedDataGeneric { + class BoneData : public PosedDataGeneric { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/BoneLocal.h b/spine-cpp/include/spine/BoneLocal.h index d74eda648..a78cfdee8 100644 --- a/spine-cpp/include/spine/BoneLocal.h +++ b/spine-cpp/include/spine/BoneLocal.h @@ -37,7 +37,7 @@ namespace spine { /// Stores a bone's local pose. - class SP_API BoneLocal : public Pose { + class BoneLocal : public Pose { friend class IkConstraint; friend class BoneTimeline1; friend class BoneTimeline2; diff --git a/spine-cpp/include/spine/BonePose.h b/spine-cpp/include/spine/BonePose.h index 1f78fab1b..daf4d2c34 100644 --- a/spine-cpp/include/spine/BonePose.h +++ b/spine-cpp/include/spine/BonePose.h @@ -40,7 +40,7 @@ namespace spine { /// The applied pose for a bone. This is the Bone pose with constraints applied and the world transform computed by /// Skeleton::updateWorldTransform(Physics). - class SP_API BonePose : public BoneLocal, public Update { + class BonePose : public BoneLocal, public Update { friend class IkConstraint; friend class PathConstraint; friend class PhysicsConstraint; diff --git a/spine-cpp/include/spine/BoneTimeline.h b/spine-cpp/include/spine/BoneTimeline.h index 85ae26e2f..adff3e2dc 100644 --- a/spine-cpp/include/spine/BoneTimeline.h +++ b/spine-cpp/include/spine/BoneTimeline.h @@ -31,7 +31,7 @@ #define Spine_BoneTimeline_h #include -#include + #include namespace spine { @@ -40,7 +40,7 @@ namespace spine { class BoneLocal; /// An interface for timelines which change the property of a bone. - class SP_API BoneTimeline { + class BoneTimeline { RTTI_DECL_NOPARENT public: @@ -56,7 +56,7 @@ namespace spine { }; /// Base class for timelines that animate a single bone property. - class SP_API BoneTimeline1 : public CurveTimeline1, public BoneTimeline { + class BoneTimeline1 : public CurveTimeline1, public BoneTimeline { friend class SkeletonBinary; friend class SkeletonJson; friend class AnimationState; @@ -85,7 +85,7 @@ namespace spine { }; /// Base class for timelines that animate two bone properties. - class SP_API BoneTimeline2 : public CurveTimeline, public BoneTimeline { + class BoneTimeline2 : public CurveTimeline, public BoneTimeline { friend class SkeletonBinary; friend class SkeletonJson; friend class AnimationState; diff --git a/spine-cpp/include/spine/BoundingBoxAttachment.h b/spine-cpp/include/spine/BoundingBoxAttachment.h index 3ec328430..a566cd21b 100644 --- a/spine-cpp/include/spine/BoundingBoxAttachment.h +++ b/spine-cpp/include/spine/BoundingBoxAttachment.h @@ -36,7 +36,7 @@ namespace spine { /// Attachment that has a polygon for bounds checking. - class SP_API BoundingBoxAttachment : public VertexAttachment { + class BoundingBoxAttachment : public VertexAttachment { RTTI_DECL public: diff --git a/spine-cpp/include/spine/ClippingAttachment.h b/spine-cpp/include/spine/ClippingAttachment.h index 3e5136178..206a3f6ae 100644 --- a/spine-cpp/include/spine/ClippingAttachment.h +++ b/spine-cpp/include/spine/ClippingAttachment.h @@ -36,7 +36,7 @@ namespace spine { class SlotData; - class SP_API ClippingAttachment : public VertexAttachment { + class ClippingAttachment : public VertexAttachment { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/Color.h b/spine-cpp/include/spine/Color.h index 0c670a894..ae62fafd5 100644 --- a/spine-cpp/include/spine/Color.h +++ b/spine-cpp/include/spine/Color.h @@ -35,7 +35,7 @@ #include namespace spine { - class SP_API Color : public SpineObject { + class Color : public SpineObject { public: Color() : r(0), g(0), b(0), a(0) { } diff --git a/spine-cpp/include/spine/ColorTimeline.h b/spine-cpp/include/spine/ColorTimeline.h index 82d55a501..e93fcd4d3 100644 --- a/spine-cpp/include/spine/ColorTimeline.h +++ b/spine-cpp/include/spine/ColorTimeline.h @@ -35,7 +35,7 @@ namespace spine { /// Changes a slot's SlotPose::getColor(). - class SP_API RGBATimeline : public SlotCurveTimeline { + class RGBATimeline : public SlotCurveTimeline { friend class SkeletonBinary; friend class SkeletonJson; @@ -63,7 +63,7 @@ namespace spine { }; /// Changes the RGB for a slot's SlotPose::getColor(). - class SP_API RGBTimeline : public SlotCurveTimeline { + class RGBTimeline : public SlotCurveTimeline { friend class SkeletonBinary; friend class SkeletonJson; @@ -89,7 +89,7 @@ namespace spine { static const int B = 3; }; - class SP_API AlphaTimeline : public CurveTimeline1, public SlotTimeline { + class AlphaTimeline : public CurveTimeline1, public SlotTimeline { friend class SkeletonBinary; friend class SkeletonJson; @@ -113,7 +113,7 @@ namespace spine { }; /// Changes a slot's SlotPose::getColor() and SlotPose::getDarkColor() for two color tinting. - class SP_API RGBA2Timeline : public SlotCurveTimeline { + class RGBA2Timeline : public SlotCurveTimeline { friend class SkeletonBinary; friend class SkeletonJson; @@ -144,7 +144,7 @@ namespace spine { }; /// Changes the RGB for a slot's SlotPose::getColor() and SlotPose::getDarkColor() for two color tinting. - class SP_API RGB2Timeline : public SlotCurveTimeline { + class RGB2Timeline : public SlotCurveTimeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/Constraint.h b/spine-cpp/include/spine/Constraint.h index 8bab0ecc9..b4b05e786 100644 --- a/spine-cpp/include/spine/Constraint.h +++ b/spine-cpp/include/spine/Constraint.h @@ -39,7 +39,7 @@ namespace spine { class Skeleton; - class SP_API Constraint : public Update { + class Constraint : public Update { friend class Skeleton; public: diff --git a/spine-cpp/include/spine/ConstraintData.h b/spine-cpp/include/spine/ConstraintData.h index 687f95340..aec0ebad5 100644 --- a/spine-cpp/include/spine/ConstraintData.h +++ b/spine-cpp/include/spine/ConstraintData.h @@ -39,7 +39,7 @@ namespace spine { class Skeleton; class Constraint; - class SP_API ConstraintData : public SpineObject { + class ConstraintData : public SpineObject { RTTI_DECL_NOPARENT friend class Skeleton; friend class Constraint; diff --git a/spine-cpp/include/spine/ConstraintTimeline.h b/spine-cpp/include/spine/ConstraintTimeline.h index 95fa7997f..c533f1152 100644 --- a/spine-cpp/include/spine/ConstraintTimeline.h +++ b/spine-cpp/include/spine/ConstraintTimeline.h @@ -30,12 +30,12 @@ #ifndef Spine_ConstraintTimeline_h #define Spine_ConstraintTimeline_h -#include + #include namespace spine { /// An interface for timelines which change the property of a constraint. - class SP_API ConstraintTimeline { + class ConstraintTimeline { RTTI_DECL_NOPARENT public: diff --git a/spine-cpp/include/spine/ConstraintTimeline1.h b/spine-cpp/include/spine/ConstraintTimeline1.h index d556a7105..9369bb906 100644 --- a/spine-cpp/include/spine/ConstraintTimeline1.h +++ b/spine-cpp/include/spine/ConstraintTimeline1.h @@ -36,7 +36,7 @@ namespace spine { /// Base class for single-value constraint timelines. - class SP_API ConstraintTimeline1 : public CurveTimeline1, public ConstraintTimeline { + class ConstraintTimeline1 : public CurveTimeline1, public ConstraintTimeline { RTTI_DECL public: diff --git a/spine-cpp/include/spine/CurveTimeline.h b/spine-cpp/include/spine/CurveTimeline.h index e1a03bb2e..503744071 100644 --- a/spine-cpp/include/spine/CurveTimeline.h +++ b/spine-cpp/include/spine/CurveTimeline.h @@ -35,7 +35,7 @@ namespace spine { /// Base class for frames that use an interpolation bezier curve. - class SP_API CurveTimeline : public Timeline { + class CurveTimeline : public Timeline { RTTI_DECL public: @@ -64,7 +64,7 @@ namespace spine { }; /// The base class for a CurveTimeline that sets one property. - class SP_API CurveTimeline1 : public CurveTimeline { + class CurveTimeline1 : public CurveTimeline { RTTI_DECL public: diff --git a/spine-cpp/include/spine/Debug.h b/spine-cpp/include/spine/Debug.h index b3a3227b6..c1a90f98e 100644 --- a/spine-cpp/include/spine/Debug.h +++ b/spine-cpp/include/spine/Debug.h @@ -48,7 +48,7 @@ namespace spine { class DebugEntry; public: - class SP_API DebugPair { + class DebugPair { public: explicit DebugPair(K &k, V &v) : key(k), value(v) { } @@ -57,7 +57,7 @@ namespace spine { V &value; }; - class SP_API DebugEntries { + class DebugEntries { public: friend class DebugHashMap; @@ -183,7 +183,7 @@ namespace spine { return NULL; } - class SP_API DebugEntry { + class DebugEntry { public: K _key; V _value; @@ -199,7 +199,7 @@ namespace spine { }; #endif// SPINE_NO_CPP_RT - class SP_API DebugExtension : public SpineExtension { + class DebugExtension : public SpineExtension { struct Allocation { void *address; size_t size; diff --git a/spine-cpp/include/spine/DeformTimeline.h b/spine-cpp/include/spine/DeformTimeline.h index d6698e86f..0ba93055a 100644 --- a/spine-cpp/include/spine/DeformTimeline.h +++ b/spine-cpp/include/spine/DeformTimeline.h @@ -36,7 +36,7 @@ namespace spine { class VertexAttachment; /// Changes a slot's SlotPose::getDeform() to deform a VertexAttachment. - class SP_API DeformTimeline : public SlotCurveTimeline { + class DeformTimeline : public SlotCurveTimeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/DrawOrderTimeline.h b/spine-cpp/include/spine/DrawOrderTimeline.h index e3fe95c9d..514d47ee8 100644 --- a/spine-cpp/include/spine/DrawOrderTimeline.h +++ b/spine-cpp/include/spine/DrawOrderTimeline.h @@ -34,7 +34,7 @@ namespace spine { /// Changes a skeleton's Skeleton::getDrawOrder(). - class SP_API DrawOrderTimeline : public Timeline { + class DrawOrderTimeline : public Timeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/Event.h b/spine-cpp/include/spine/Event.h index 3e749b91d..9efa4728b 100644 --- a/spine-cpp/include/spine/Event.h +++ b/spine-cpp/include/spine/Event.h @@ -40,7 +40,7 @@ namespace spine { /// /// See Timeline::apply(), AnimationStateListener::event(), and /// @see https://esotericsoftware.com/spine-events Events in the Spine User Guide. - class SP_API Event : public SpineObject { + class Event : public SpineObject { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/EventData.h b/spine-cpp/include/spine/EventData.h index 6a8c612dd..925fe755e 100644 --- a/spine-cpp/include/spine/EventData.h +++ b/spine-cpp/include/spine/EventData.h @@ -35,7 +35,7 @@ namespace spine { /// Stores the setup pose values for an Event. - class SP_API EventData : public SpineObject { + class EventData : public SpineObject { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/EventTimeline.h b/spine-cpp/include/spine/EventTimeline.h index 1ef07dc41..2ba206dd5 100644 --- a/spine-cpp/include/spine/EventTimeline.h +++ b/spine-cpp/include/spine/EventTimeline.h @@ -34,7 +34,7 @@ namespace spine { /// Fires an Event when specific animation times are reached. - class SP_API EventTimeline : public Timeline { + class EventTimeline : public Timeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/Extension.h b/spine-cpp/include/spine/Extension.h index e3d0d6f34..fa3822757 100644 --- a/spine-cpp/include/spine/Extension.h +++ b/spine-cpp/include/spine/Extension.h @@ -33,14 +33,14 @@ #include #include -#include + #define SP_UNUSED(x) (void) (x) namespace spine { class String; - class SP_API SpineExtension { + class SpineExtension { public: template static T *alloc(size_t num, const char *file, int line) { @@ -108,7 +108,7 @@ namespace spine { static SpineExtension *_instance; }; - class SP_API DefaultSpineExtension : public SpineExtension { + class DefaultSpineExtension : public SpineExtension { public: DefaultSpineExtension(); diff --git a/spine-cpp/include/spine/HasRendererObject.h b/spine-cpp/include/spine/HasRendererObject.h index 55e038c5f..5f10a3d57 100644 --- a/spine-cpp/include/spine/HasRendererObject.h +++ b/spine-cpp/include/spine/HasRendererObject.h @@ -30,13 +30,13 @@ #ifndef Spine_HasRendererObject_h #define Spine_HasRendererObject_h -#include + namespace spine { typedef void (*DisposeRendererObject)(void *rendererObject); - class SP_API HasRendererObject { + class HasRendererObject { public: explicit HasRendererObject() : _rendererObject(0), _dispose(0) {}; diff --git a/spine-cpp/include/spine/HashMap.h b/spine-cpp/include/spine/HashMap.h index 6bcbe49af..5653d4d50 100644 --- a/spine-cpp/include/spine/HashMap.h +++ b/spine-cpp/include/spine/HashMap.h @@ -183,7 +183,7 @@ namespace spine { return NULL; } - class SP_API Entry : public SpineObject { + class Entry : public SpineObject { public: K _key; V _value; diff --git a/spine-cpp/include/spine/IkConstraint.h b/spine-cpp/include/spine/IkConstraint.h index 304106e24..ac4c9656d 100644 --- a/spine-cpp/include/spine/IkConstraint.h +++ b/spine-cpp/include/spine/IkConstraint.h @@ -41,7 +41,7 @@ namespace spine { class Bone; class BonePose; - class SP_API IkConstraint : public ConstraintGeneric { + class IkConstraint : public ConstraintGeneric { friend class Skeleton; friend class IkConstraintTimeline; diff --git a/spine-cpp/include/spine/IkConstraintData.h b/spine-cpp/include/spine/IkConstraintData.h index eb15d32ea..ed9401d65 100644 --- a/spine-cpp/include/spine/IkConstraintData.h +++ b/spine-cpp/include/spine/IkConstraintData.h @@ -41,7 +41,7 @@ namespace spine { class BoneData; class IkConstraint; - class SP_API IkConstraintData : public ConstraintDataGeneric { + class IkConstraintData : public ConstraintDataGeneric { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/IkConstraintPose.h b/spine-cpp/include/spine/IkConstraintPose.h index cc25abc35..d5027f082 100644 --- a/spine-cpp/include/spine/IkConstraintPose.h +++ b/spine-cpp/include/spine/IkConstraintPose.h @@ -36,7 +36,7 @@ namespace spine { /// Stores the current pose for an IK constraint. - class SP_API IkConstraintPose : public Pose { + class IkConstraintPose : public Pose { friend class IkConstraint; friend class IkConstraintTimeline; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/IkConstraintTimeline.h b/spine-cpp/include/spine/IkConstraintTimeline.h index 4dbf789c9..f007e9faa 100644 --- a/spine-cpp/include/spine/IkConstraintTimeline.h +++ b/spine-cpp/include/spine/IkConstraintTimeline.h @@ -37,7 +37,7 @@ namespace spine { /// Changes an IK constraint's IkConstraintPose::getMix(), IkConstraintPose::getSoftness(), /// IkConstraintPose::getBendDirection(), IkConstraintPose::getStretch(), and IkConstraintPose::getCompress(). - class SP_API IkConstraintTimeline : public CurveTimeline, public ConstraintTimeline { + class IkConstraintTimeline : public CurveTimeline, public ConstraintTimeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/InheritTimeline.h b/spine-cpp/include/spine/InheritTimeline.h index 7aa970720..bd915653b 100644 --- a/spine-cpp/include/spine/InheritTimeline.h +++ b/spine-cpp/include/spine/InheritTimeline.h @@ -39,7 +39,7 @@ namespace spine { /// Changes a bone's BoneLocal::getInherit(). - class SP_API InheritTimeline : public Timeline, public BoneTimeline { + class InheritTimeline : public Timeline, public BoneTimeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/Json.h b/spine-cpp/include/spine/Json.h index b7683f16d..4bf1a41c2 100644 --- a/spine-cpp/include/spine/Json.h +++ b/spine-cpp/include/spine/Json.h @@ -39,7 +39,7 @@ #endif namespace spine { - class SP_API Json : public SpineObject { + class Json : public SpineObject { friend class SkeletonJson; public: diff --git a/spine-cpp/include/spine/LinkedMesh.h b/spine-cpp/include/spine/LinkedMesh.h index 75ec16185..c411c3af1 100644 --- a/spine-cpp/include/spine/LinkedMesh.h +++ b/spine-cpp/include/spine/LinkedMesh.h @@ -36,7 +36,7 @@ namespace spine { class MeshAttachment; - class SP_API LinkedMesh : public SpineObject { + class LinkedMesh : public SpineObject { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/MathUtil.h b/spine-cpp/include/spine/MathUtil.h index 96e257dcd..b07f4b6fc 100644 --- a/spine-cpp/include/spine/MathUtil.h +++ b/spine-cpp/include/spine/MathUtil.h @@ -39,7 +39,7 @@ namespace spine { - class SP_API MathUtil : public SpineObject { + class MathUtil : public SpineObject { private: MathUtil(); diff --git a/spine-cpp/include/spine/MeshAttachment.h b/spine-cpp/include/spine/MeshAttachment.h index 29ee64799..3519043fe 100644 --- a/spine-cpp/include/spine/MeshAttachment.h +++ b/spine-cpp/include/spine/MeshAttachment.h @@ -39,7 +39,7 @@ namespace spine { /// Attachment that displays a texture region using a mesh. - class SP_API MeshAttachment : public VertexAttachment { + class MeshAttachment : public VertexAttachment { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/PathAttachment.h b/spine-cpp/include/spine/PathAttachment.h index f0ebbcc1d..7fefc6ea9 100644 --- a/spine-cpp/include/spine/PathAttachment.h +++ b/spine-cpp/include/spine/PathAttachment.h @@ -34,7 +34,7 @@ #include namespace spine { - class SP_API PathAttachment : public VertexAttachment { + class PathAttachment : public VertexAttachment { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/PathConstraint.h b/spine-cpp/include/spine/PathConstraint.h index 41cb36b1a..f6f379907 100644 --- a/spine-cpp/include/spine/PathConstraint.h +++ b/spine-cpp/include/spine/PathConstraint.h @@ -49,7 +49,7 @@ namespace spine { /// constrained bones so they follow a PathAttachment. /// /// See https://esotericsoftware.com/spine-path-constraints Path constraints in the Spine User Guide. - class SP_API PathConstraint : public ConstraintGeneric { + class PathConstraint : public ConstraintGeneric { friend class Skeleton; friend class PathConstraintMixTimeline; friend class PathConstraintPositionTimeline; diff --git a/spine-cpp/include/spine/PathConstraintData.h b/spine-cpp/include/spine/PathConstraintData.h index 008c4bf47..8ca2fc530 100644 --- a/spine-cpp/include/spine/PathConstraintData.h +++ b/spine-cpp/include/spine/PathConstraintData.h @@ -34,7 +34,7 @@ #include #include #include -#include + #include #include #include @@ -48,7 +48,7 @@ namespace spine { /// Stores the setup pose for a PathConstraint. /// /// See https://esotericsoftware.com/spine-path-constraints Path constraints in the Spine User Guide. - class SP_API PathConstraintData : public ConstraintDataGeneric { + class PathConstraintData : public ConstraintDataGeneric { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/PathConstraintMixTimeline.h b/spine-cpp/include/spine/PathConstraintMixTimeline.h index 44fdf8fcd..892db3dcb 100644 --- a/spine-cpp/include/spine/PathConstraintMixTimeline.h +++ b/spine-cpp/include/spine/PathConstraintMixTimeline.h @@ -37,7 +37,7 @@ namespace spine { /// Changes a path constraint's PathConstraintPose::getMixRotate(), PathConstraintPose::getMixX(), and /// PathConstraintPose::getMixY(). - class SP_API PathConstraintMixTimeline : public CurveTimeline, public ConstraintTimeline { + class PathConstraintMixTimeline : public CurveTimeline, public ConstraintTimeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/PathConstraintPose.h b/spine-cpp/include/spine/PathConstraintPose.h index 7ced81989..fdc751b0d 100644 --- a/spine-cpp/include/spine/PathConstraintPose.h +++ b/spine-cpp/include/spine/PathConstraintPose.h @@ -35,7 +35,7 @@ namespace spine { /// Stores a pose for a path constraint. - class SP_API PathConstraintPose : public Pose { + class PathConstraintPose : public Pose { friend class PathConstraint; friend class PathConstraintPositionTimeline; friend class PathConstraintSpacingTimeline; diff --git a/spine-cpp/include/spine/PathConstraintPositionTimeline.h b/spine-cpp/include/spine/PathConstraintPositionTimeline.h index 2ddd67bcd..057ac00dd 100644 --- a/spine-cpp/include/spine/PathConstraintPositionTimeline.h +++ b/spine-cpp/include/spine/PathConstraintPositionTimeline.h @@ -35,7 +35,7 @@ namespace spine { /// Changes a path constraint's PathConstraintPose::getPosition(). - class SP_API PathConstraintPositionTimeline : public ConstraintTimeline1 { + class PathConstraintPositionTimeline : public ConstraintTimeline1 { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/PathConstraintSpacingTimeline.h b/spine-cpp/include/spine/PathConstraintSpacingTimeline.h index 443f07380..2e0ef20ad 100644 --- a/spine-cpp/include/spine/PathConstraintSpacingTimeline.h +++ b/spine-cpp/include/spine/PathConstraintSpacingTimeline.h @@ -34,7 +34,7 @@ namespace spine { /// Changes a path constraint's PathConstraintPose::getSpacing(). - class SP_API PathConstraintSpacingTimeline : public ConstraintTimeline1 { + class PathConstraintSpacingTimeline : public ConstraintTimeline1 { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/PhysicsConstraint.h b/spine-cpp/include/spine/PhysicsConstraint.h index 121a4148b..c24b3a3c2 100644 --- a/spine-cpp/include/spine/PhysicsConstraint.h +++ b/spine-cpp/include/spine/PhysicsConstraint.h @@ -44,7 +44,7 @@ namespace spine { /// Stores the current pose for a physics constraint. A physics constraint applies physics to bones. /// /// See https://esotericsoftware.com/spine-physics-constraints Physics constraints in the Spine User Guide. - class SP_API PhysicsConstraint : public ConstraintGeneric { + class PhysicsConstraint : public ConstraintGeneric { friend class Skeleton; friend class PhysicsConstraintTimeline; friend class PhysicsConstraintInertiaTimeline; diff --git a/spine-cpp/include/spine/PhysicsConstraintData.h b/spine-cpp/include/spine/PhysicsConstraintData.h index 33f3bf827..47ee61f47 100644 --- a/spine-cpp/include/spine/PhysicsConstraintData.h +++ b/spine-cpp/include/spine/PhysicsConstraintData.h @@ -41,7 +41,7 @@ namespace spine { /// Stores the setup pose for a PhysicsConstraint. /// /// See https://esotericsoftware.com/spine-physics-constraints Physics constraints in the Spine User Guide. - class SP_API PhysicsConstraintData : public ConstraintDataGeneric { + class PhysicsConstraintData : public ConstraintDataGeneric { friend class SkeletonBinary; friend class SkeletonJson; friend class PhysicsConstraint; diff --git a/spine-cpp/include/spine/PhysicsConstraintPose.h b/spine-cpp/include/spine/PhysicsConstraintPose.h index 330179f0b..1d62757f8 100644 --- a/spine-cpp/include/spine/PhysicsConstraintPose.h +++ b/spine-cpp/include/spine/PhysicsConstraintPose.h @@ -35,7 +35,7 @@ namespace spine { /// Stores a pose for a physics constraint. - class SP_API PhysicsConstraintPose : public Pose { + class PhysicsConstraintPose : public Pose { friend class PhysicsConstraint; friend class PhysicsConstraintTimeline; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/PhysicsConstraintTimeline.h b/spine-cpp/include/spine/PhysicsConstraintTimeline.h index 2eb7ea4f4..9303b8ee4 100644 --- a/spine-cpp/include/spine/PhysicsConstraintTimeline.h +++ b/spine-cpp/include/spine/PhysicsConstraintTimeline.h @@ -39,7 +39,7 @@ namespace spine { /// The base class for most PhysicsConstraint timelines. - class SP_API PhysicsConstraintTimeline : public CurveTimeline1, public ConstraintTimeline { + class PhysicsConstraintTimeline : public CurveTimeline1, public ConstraintTimeline { friend class SkeletonBinary; friend class SkeletonJson; @@ -70,7 +70,7 @@ namespace spine { }; /// Changes a physics constraint's PhysicsConstraintPose::getInertia(). - class SP_API PhysicsConstraintInertiaTimeline : public PhysicsConstraintTimeline { + class PhysicsConstraintInertiaTimeline : public PhysicsConstraintTimeline { friend class SkeletonBinary; friend class SkeletonJson; @@ -96,7 +96,7 @@ namespace spine { }; /// Changes a physics constraint's PhysicsConstraintPose::getStrength(). - class SP_API PhysicsConstraintStrengthTimeline : public PhysicsConstraintTimeline { + class PhysicsConstraintStrengthTimeline : public PhysicsConstraintTimeline { friend class SkeletonBinary; friend class SkeletonJson; @@ -122,7 +122,7 @@ namespace spine { }; /// Changes a physics constraint's PhysicsConstraintPose::getDamping(). - class SP_API PhysicsConstraintDampingTimeline : public PhysicsConstraintTimeline { + class PhysicsConstraintDampingTimeline : public PhysicsConstraintTimeline { friend class SkeletonBinary; friend class SkeletonJson; @@ -149,7 +149,7 @@ namespace spine { /// Changes a physics constraint's PhysicsConstraintPose::getMassInverse(). The /// timeline values are not inverted. - class SP_API PhysicsConstraintMassTimeline : public PhysicsConstraintTimeline { + class PhysicsConstraintMassTimeline : public PhysicsConstraintTimeline { friend class SkeletonBinary; friend class SkeletonJson; @@ -175,7 +175,7 @@ namespace spine { }; /// Changes a physics constraint's PhysicsConstraintPose::getWind(). - class SP_API PhysicsConstraintWindTimeline : public PhysicsConstraintTimeline { + class PhysicsConstraintWindTimeline : public PhysicsConstraintTimeline { friend class SkeletonBinary; friend class SkeletonJson; @@ -201,7 +201,7 @@ namespace spine { }; /// Changes a physics constraint's PhysicsConstraintPose::getGravity(). - class SP_API PhysicsConstraintGravityTimeline : public PhysicsConstraintTimeline { + class PhysicsConstraintGravityTimeline : public PhysicsConstraintTimeline { friend class SkeletonBinary; friend class SkeletonJson; @@ -227,7 +227,7 @@ namespace spine { }; /// Changes a physics constraint's PhysicsConstraintPose::getMix(). - class SP_API PhysicsConstraintMixTimeline : public PhysicsConstraintTimeline { + class PhysicsConstraintMixTimeline : public PhysicsConstraintTimeline { friend class SkeletonBinary; friend class SkeletonJson; @@ -253,7 +253,7 @@ namespace spine { }; /// Resets a physics constraint when specific animation times are reached. - class SP_API PhysicsConstraintResetTimeline : public Timeline, public ConstraintTimeline { + class PhysicsConstraintResetTimeline : public Timeline, public ConstraintTimeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/PointAttachment.h b/spine-cpp/include/spine/PointAttachment.h index 5e162b487..884c5f70a 100644 --- a/spine-cpp/include/spine/PointAttachment.h +++ b/spine-cpp/include/spine/PointAttachment.h @@ -43,7 +43,7 @@ namespace spine { /// /// See https://esotericsoftware.com/spine-points for Point Attachments in the Spine User Guide. /// - class SP_API PointAttachment : public Attachment { + class PointAttachment : public Attachment { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/Pool.h b/spine-cpp/include/spine/Pool.h index 53d095191..5fe91be15 100644 --- a/spine-cpp/include/spine/Pool.h +++ b/spine-cpp/include/spine/Pool.h @@ -37,7 +37,7 @@ namespace spine { template - class SP_API Pool : public SpineObject { + class Pool : public SpineObject { public: Pool() { } diff --git a/spine-cpp/include/spine/Pose.h b/spine-cpp/include/spine/Pose.h index 30f1e2477..fd80f829a 100644 --- a/spine-cpp/include/spine/Pose.h +++ b/spine-cpp/include/spine/Pose.h @@ -34,7 +34,7 @@ namespace spine { template - class SP_API Pose : public SpineObject { + class Pose : public SpineObject { public: Pose() {}; virtual ~Pose() {}; diff --git a/spine-cpp/include/spine/Posed.h b/spine-cpp/include/spine/Posed.h index ad813b061..8c5e39b40 100644 --- a/spine-cpp/include/spine/Posed.h +++ b/spine-cpp/include/spine/Posed.h @@ -33,7 +33,7 @@ #include namespace spine { - class SP_API Posed { + class Posed { public: Posed() { } diff --git a/spine-cpp/include/spine/PosedActive.h b/spine-cpp/include/spine/PosedActive.h index 02bdef531..720fad14e 100644 --- a/spine-cpp/include/spine/PosedActive.h +++ b/spine-cpp/include/spine/PosedActive.h @@ -30,11 +30,11 @@ #ifndef Spine_PosedActive_h #define Spine_PosedActive_h -#include + namespace spine { /// Simple mixin class that adds active state tracking - class SP_API PosedActive { + class PosedActive { protected: bool _active; diff --git a/spine-cpp/include/spine/PosedData.h b/spine-cpp/include/spine/PosedData.h index 1b765c46a..2a4f152af 100644 --- a/spine-cpp/include/spine/PosedData.h +++ b/spine-cpp/include/spine/PosedData.h @@ -37,7 +37,7 @@ namespace spine { template class Pose; - class SP_API PosedData : public SpineObject { + class PosedData : public SpineObject { friend class SkeletonBinary; friend class SkeletonJson; friend class BoneTimeline1; diff --git a/spine-cpp/include/spine/RTTI.h b/spine-cpp/include/spine/RTTI.h index 43cdbe5ec..5de8c3561 100644 --- a/spine-cpp/include/spine/RTTI.h +++ b/spine-cpp/include/spine/RTTI.h @@ -30,10 +30,10 @@ #ifndef Spine_RTTI_h #define Spine_RTTI_h -#include + namespace spine { - class SP_API RTTI { + class RTTI { public: explicit RTTI(const char *className); diff --git a/spine-cpp/include/spine/RegionAttachment.h b/spine-cpp/include/spine/RegionAttachment.h index af5820e4b..922e1d982 100644 --- a/spine-cpp/include/spine/RegionAttachment.h +++ b/spine-cpp/include/spine/RegionAttachment.h @@ -43,7 +43,7 @@ namespace spine { class Slot; /// Attachment that displays a texture region. - class SP_API RegionAttachment : public Attachment { + class RegionAttachment : public Attachment { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/RotateTimeline.h b/spine-cpp/include/spine/RotateTimeline.h index 84de7e99f..55eb2d8f3 100644 --- a/spine-cpp/include/spine/RotateTimeline.h +++ b/spine-cpp/include/spine/RotateTimeline.h @@ -34,7 +34,7 @@ namespace spine { /// Changes a bone's local rotation. - class SP_API RotateTimeline : public BoneTimeline1 { + class RotateTimeline : public BoneTimeline1 { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/ScaleTimeline.h b/spine-cpp/include/spine/ScaleTimeline.h index 759bf94d6..85232f1f7 100644 --- a/spine-cpp/include/spine/ScaleTimeline.h +++ b/spine-cpp/include/spine/ScaleTimeline.h @@ -34,7 +34,7 @@ namespace spine { /// Changes a bone's local BoneLocal::getScaleX() and BoneLocal::getScaleY(). - class SP_API ScaleTimeline : public BoneTimeline2 { + class ScaleTimeline : public BoneTimeline2 { friend class SkeletonBinary; friend class SkeletonJson; @@ -49,7 +49,7 @@ namespace spine { }; /// Changes a bone's local BoneLocal::getScaleX(). - class SP_API ScaleXTimeline : public BoneTimeline1 { + class ScaleXTimeline : public BoneTimeline1 { friend class SkeletonBinary; friend class SkeletonJson; @@ -64,7 +64,7 @@ namespace spine { }; /// Changes a bone's local BoneLocal::getScaleY(). - class SP_API ScaleYTimeline : public BoneTimeline1 { + class ScaleYTimeline : public BoneTimeline1 { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/Sequence.h b/spine-cpp/include/spine/Sequence.h index 6b4554edd..c3ec021bc 100644 --- a/spine-cpp/include/spine/Sequence.h +++ b/spine-cpp/include/spine/Sequence.h @@ -42,7 +42,7 @@ namespace spine { class SkeletonBinary; class SkeletonJson; - class SP_API Sequence : public SpineObject { + class Sequence : public SpineObject { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/SequenceTimeline.h b/spine-cpp/include/spine/SequenceTimeline.h index f5e2f7bd9..36a078a5a 100644 --- a/spine-cpp/include/spine/SequenceTimeline.h +++ b/spine-cpp/include/spine/SequenceTimeline.h @@ -39,7 +39,7 @@ namespace spine { class HasTextureRegion; /// Changes a slot's SlotPose::getSequenceIndex() for an attachment's Sequence. - class SP_API SequenceTimeline : public Timeline, public SlotTimeline { + class SequenceTimeline : public Timeline, public SlotTimeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/ShearTimeline.h b/spine-cpp/include/spine/ShearTimeline.h index b04af3e94..71a164756 100644 --- a/spine-cpp/include/spine/ShearTimeline.h +++ b/spine-cpp/include/spine/ShearTimeline.h @@ -34,7 +34,7 @@ namespace spine { /// Changes a bone's local BoneLocal::getShearX() and BoneLocal::getShearY(). - class SP_API ShearTimeline : public BoneTimeline2 { + class ShearTimeline : public BoneTimeline2 { friend class SkeletonBinary; friend class SkeletonJson; @@ -49,7 +49,7 @@ namespace spine { }; /// Changes a bone's local BoneLocal::getShearX(). - class SP_API ShearXTimeline : public BoneTimeline1 { + class ShearXTimeline : public BoneTimeline1 { friend class SkeletonBinary; friend class SkeletonJson; @@ -64,7 +64,7 @@ namespace spine { }; /// Changes a bone's local BoneLocal::getShearY(). - class SP_API ShearYTimeline : public BoneTimeline1 { + class ShearYTimeline : public BoneTimeline1 { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/Skeleton.h b/spine-cpp/include/spine/Skeleton.h index dcd8f67e2..dd72b1211 100644 --- a/spine-cpp/include/spine/Skeleton.h +++ b/spine-cpp/include/spine/Skeleton.h @@ -65,7 +65,7 @@ namespace spine { class SkeletonClipping; - class SP_API Skeleton : public SpineObject { + class Skeleton : public SpineObject { friend class AnimationState; friend class SkeletonBounds; diff --git a/spine-cpp/include/spine/SkeletonBinary.h b/spine-cpp/include/spine/SkeletonBinary.h index a6179744f..d251a588c 100644 --- a/spine-cpp/include/spine/SkeletonBinary.h +++ b/spine-cpp/include/spine/SkeletonBinary.h @@ -65,7 +65,7 @@ namespace spine { class Sequence; - class SP_API SkeletonBinary : public SpineObject { + class SkeletonBinary : public SpineObject { public: static const int BONE_ROTATE = 0; static const int BONE_TRANSLATE = 1; diff --git a/spine-cpp/include/spine/SkeletonBounds.h b/spine-cpp/include/spine/SkeletonBounds.h index 2593410f4..25c039d6f 100644 --- a/spine-cpp/include/spine/SkeletonBounds.h +++ b/spine-cpp/include/spine/SkeletonBounds.h @@ -43,7 +43,7 @@ namespace spine { /// Collects each BoundingBoxAttachment that is visible and computes the world vertices for its polygon. /// The polygon vertices are provided along with convenience methods for doing hit detection. - class SP_API SkeletonBounds : public SpineObject { + class SkeletonBounds : public SpineObject { public: SkeletonBounds(); diff --git a/spine-cpp/include/spine/SkeletonClipping.h b/spine-cpp/include/spine/SkeletonClipping.h index c9fb7de81..ffadd9a57 100644 --- a/spine-cpp/include/spine/SkeletonClipping.h +++ b/spine-cpp/include/spine/SkeletonClipping.h @@ -38,7 +38,7 @@ namespace spine { class Skeleton; class ClippingAttachment; - class SP_API SkeletonClipping : public SpineObject { + class SkeletonClipping : public SpineObject { public: SkeletonClipping(); diff --git a/spine-cpp/include/spine/SkeletonData.h b/spine-cpp/include/spine/SkeletonData.h index a5fd92f03..ad717ec30 100644 --- a/spine-cpp/include/spine/SkeletonData.h +++ b/spine-cpp/include/spine/SkeletonData.h @@ -59,7 +59,7 @@ namespace spine { /// /// See Data objects in the Spine Runtimes /// Guide. - class SP_API SkeletonData : public SpineObject { + class SkeletonData : public SpineObject { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/SkeletonJson.h b/spine-cpp/include/spine/SkeletonJson.h index d004930f6..fb7024f90 100644 --- a/spine-cpp/include/spine/SkeletonJson.h +++ b/spine-cpp/include/spine/SkeletonJson.h @@ -65,7 +65,7 @@ namespace spine { class Attachment; - class SP_API SkeletonJson : public SpineObject { + class SkeletonJson : public SpineObject { public: explicit SkeletonJson(Atlas &atlas); diff --git a/spine-cpp/include/spine/SkeletonRenderer.h b/spine-cpp/include/spine/SkeletonRenderer.h index 244b521e9..90447a49b 100644 --- a/spine-cpp/include/spine/SkeletonRenderer.h +++ b/spine-cpp/include/spine/SkeletonRenderer.h @@ -37,7 +37,7 @@ namespace spine { class Skeleton; - struct SP_API RenderCommand { + struct RenderCommand { float *positions; float *uvs; uint32_t *colors; @@ -50,7 +50,7 @@ namespace spine { RenderCommand *next; }; - class SP_API SkeletonRenderer : public SpineObject { + class SkeletonRenderer : public SpineObject { public: explicit SkeletonRenderer(); diff --git a/spine-cpp/include/spine/Skin.h b/spine-cpp/include/spine/Skin.h index bf645e2eb..697611d25 100644 --- a/spine-cpp/include/spine/Skin.h +++ b/spine-cpp/include/spine/Skin.h @@ -46,15 +46,15 @@ namespace spine { /// Stores attachments by slot index and attachment name. /// See SkeletonData::getDefaultSkin, Skeleton::getSkin, and /// http://esotericsoftware.com/spine-runtime-skins in the Spine Runtimes Guide. - class SP_API Skin : public SpineObject { + class Skin : public SpineObject { friend class Skeleton; public: - class SP_API AttachmentMap : public SpineObject { + class AttachmentMap : public SpineObject { friend class Skin; public: - struct SP_API Entry { + struct Entry { size_t _slotIndex; String _name; Attachment *_attachment; @@ -63,7 +63,7 @@ namespace spine { } }; - class SP_API Entries { + class Entries { friend class AttachmentMap; public: diff --git a/spine-cpp/include/spine/Slider.h b/spine-cpp/include/spine/Slider.h index 67c8a1d9b..55c8755df 100644 --- a/spine-cpp/include/spine/Slider.h +++ b/spine-cpp/include/spine/Slider.h @@ -42,7 +42,7 @@ namespace spine { /// Stores the setup pose for a PhysicsConstraint. /// /// See https://esotericsoftware.com/spine-physics-constraints Physics constraints in the Spine User Guide. - class SP_API Slider : public ConstraintGeneric { + class Slider : public ConstraintGeneric { friend class Skeleton; friend class SliderTimeline; friend class SliderMixTimeline; diff --git a/spine-cpp/include/spine/SliderData.h b/spine-cpp/include/spine/SliderData.h index 94aec7bfe..4dc075256 100644 --- a/spine-cpp/include/spine/SliderData.h +++ b/spine-cpp/include/spine/SliderData.h @@ -43,7 +43,7 @@ namespace spine { class Skeleton; /// Stores the setup pose for a Slider - class SP_API SliderData : public ConstraintDataGeneric { + class SliderData : public ConstraintDataGeneric { friend class SkeletonBinary; friend class SkeletonJson; friend class Slider; diff --git a/spine-cpp/include/spine/SliderMixTimeline.h b/spine-cpp/include/spine/SliderMixTimeline.h index 542af4134..066fb5c4f 100644 --- a/spine-cpp/include/spine/SliderMixTimeline.h +++ b/spine-cpp/include/spine/SliderMixTimeline.h @@ -34,7 +34,7 @@ namespace spine { /// Changes a slider's SliderPose::getMix(). - class SP_API SliderMixTimeline : public ConstraintTimeline1 { + class SliderMixTimeline : public ConstraintTimeline1 { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/SliderPose.h b/spine-cpp/include/spine/SliderPose.h index 04de5bbd1..450d03df8 100644 --- a/spine-cpp/include/spine/SliderPose.h +++ b/spine-cpp/include/spine/SliderPose.h @@ -37,7 +37,7 @@ namespace spine { class Slider; /// Stores a pose for a slider. - class SP_API SliderPose : public Pose { + class SliderPose : public Pose { friend class Slider; friend class SliderMixTimeline; friend class SliderTimeline; diff --git a/spine-cpp/include/spine/SliderTimeline.h b/spine-cpp/include/spine/SliderTimeline.h index 281713ef4..0d6af45f3 100644 --- a/spine-cpp/include/spine/SliderTimeline.h +++ b/spine-cpp/include/spine/SliderTimeline.h @@ -34,7 +34,7 @@ namespace spine { /// Changes a slider's SliderPose::getTime(). - class SP_API SliderTimeline : public ConstraintTimeline1 { + class SliderTimeline : public ConstraintTimeline1 { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/Slot.h b/spine-cpp/include/spine/Slot.h index edb90e2a5..41b79fea6 100644 --- a/spine-cpp/include/spine/Slot.h +++ b/spine-cpp/include/spine/Slot.h @@ -45,7 +45,7 @@ namespace spine { /// Stores a slot's current pose. Slots organize attachments for Skeleton drawOrder purposes and provide a place to store /// state for an attachment. State cannot be stored in an attachment itself because attachments are stateless and may be shared /// across multiple skeletons. - class SP_API Slot : public PosedGeneric { + class Slot : public PosedGeneric { friend class VertexAttachment; friend class Skeleton; diff --git a/spine-cpp/include/spine/SlotCurveTimeline.h b/spine-cpp/include/spine/SlotCurveTimeline.h index 6e20a377f..2fcf38ffb 100644 --- a/spine-cpp/include/spine/SlotCurveTimeline.h +++ b/spine-cpp/include/spine/SlotCurveTimeline.h @@ -38,7 +38,7 @@ namespace spine { class SlotPose; /// Base class for slot timelines that use curves. - class SP_API SlotCurveTimeline : public CurveTimeline, public SlotTimeline { + class SlotCurveTimeline : public CurveTimeline, public SlotTimeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/SlotData.h b/spine-cpp/include/spine/SlotData.h index 373291131..d14126ab8 100644 --- a/spine-cpp/include/spine/SlotData.h +++ b/spine-cpp/include/spine/SlotData.h @@ -40,7 +40,7 @@ namespace spine { class BoneData; /// Stores the setup pose for a Slot. - class SP_API SlotData : public PosedDataGeneric { + class SlotData : public PosedDataGeneric { friend class SkeletonBinary; friend class SkeletonJson; friend class PathConstraint; diff --git a/spine-cpp/include/spine/SlotPose.h b/spine-cpp/include/spine/SlotPose.h index ed77a56e5..d24383a07 100644 --- a/spine-cpp/include/spine/SlotPose.h +++ b/spine-cpp/include/spine/SlotPose.h @@ -40,7 +40,7 @@ namespace spine { class Attachment; class VertexAttachment; - class SP_API SlotPose : public Pose { + class SlotPose : public Pose { friend class Slot; friend class SlotCurveTimeline; friend class DeformTimeline; diff --git a/spine-cpp/include/spine/SlotTimeline.h b/spine-cpp/include/spine/SlotTimeline.h index d16ca9041..47592ace6 100644 --- a/spine-cpp/include/spine/SlotTimeline.h +++ b/spine-cpp/include/spine/SlotTimeline.h @@ -30,13 +30,13 @@ #ifndef Spine_SlotTimeline_h #define Spine_SlotTimeline_h -#include + #include namespace spine { /// An interface for timelines which change the property of a slot. - class SP_API SlotTimeline { + class SlotTimeline { RTTI_DECL_NOPARENT friend class AlphaTimeline; diff --git a/spine-cpp/include/spine/SpineObject.h b/spine-cpp/include/spine/SpineObject.h index dc893695a..4a26d09f8 100644 --- a/spine-cpp/include/spine/SpineObject.h +++ b/spine-cpp/include/spine/SpineObject.h @@ -33,12 +33,12 @@ #include #include -#include + namespace spine { class String; - class SP_API SpineObject { + class SpineObject { public: void *operator new(size_t sz); diff --git a/spine-cpp/include/spine/SpineString.h b/spine-cpp/include/spine/SpineString.h index 99667e57f..1ae30e660 100644 --- a/spine-cpp/include/spine/SpineString.h +++ b/spine-cpp/include/spine/SpineString.h @@ -37,7 +37,7 @@ #include namespace spine { - class SP_API String : public SpineObject { + class String : public SpineObject { public: String() : _length(0), _buffer(NULL), _tempowner(true) { } diff --git a/spine-cpp/include/spine/TextureLoader.h b/spine-cpp/include/spine/TextureLoader.h index 60f86afb9..fcf8cc642 100644 --- a/spine-cpp/include/spine/TextureLoader.h +++ b/spine-cpp/include/spine/TextureLoader.h @@ -36,7 +36,7 @@ namespace spine { class AtlasPage; - class SP_API TextureLoader : public SpineObject { + class TextureLoader : public SpineObject { public: TextureLoader(); diff --git a/spine-cpp/include/spine/TextureRegion.h b/spine-cpp/include/spine/TextureRegion.h index 158133ec5..c794f1647 100644 --- a/spine-cpp/include/spine/TextureRegion.h +++ b/spine-cpp/include/spine/TextureRegion.h @@ -34,7 +34,7 @@ #include namespace spine { - class SP_API TextureRegion : public SpineObject { + class TextureRegion : public SpineObject { friend class MeshAttachment; friend class RegionAttachment; friend class Atlas; diff --git a/spine-cpp/include/spine/Timeline.h b/spine-cpp/include/spine/Timeline.h index 777ee3c9d..6208758f8 100644 --- a/spine-cpp/include/spine/Timeline.h +++ b/spine-cpp/include/spine/Timeline.h @@ -42,7 +42,7 @@ namespace spine { class Event; - class SP_API Timeline : public SpineObject { + class Timeline : public SpineObject { RTTI_DECL_NOPARENT public: diff --git a/spine-cpp/include/spine/TransformConstraint.h b/spine-cpp/include/spine/TransformConstraint.h index ecd803318..dec2d274f 100644 --- a/spine-cpp/include/spine/TransformConstraint.h +++ b/spine-cpp/include/spine/TransformConstraint.h @@ -40,7 +40,7 @@ namespace spine { class Bone; class BonePose; - class SP_API TransformConstraint : public ConstraintGeneric { + class TransformConstraint : public ConstraintGeneric { friend class Skeleton; friend class TransformConstraintTimeline; diff --git a/spine-cpp/include/spine/TransformConstraintData.h b/spine-cpp/include/spine/TransformConstraintData.h index 6cc344672..98b207f98 100644 --- a/spine-cpp/include/spine/TransformConstraintData.h +++ b/spine-cpp/include/spine/TransformConstraintData.h @@ -45,7 +45,7 @@ namespace spine { class ToProperty; /// Source property for a TransformConstraint. - class SP_API FromProperty : public SpineObject { + class FromProperty : public SpineObject { friend class SkeletonBinary; public: @@ -65,7 +65,7 @@ namespace spine { }; /// Constrained property for a TransformConstraint. - class SP_API ToProperty : public SpineObject { + class ToProperty : public SpineObject { friend class SkeletonBinary; public: @@ -90,7 +90,7 @@ namespace spine { virtual void apply(Skeleton &skeleton, TransformConstraintPose &pose, BonePose &bone, float value, bool local, bool additive) = 0; }; - class SP_API FromRotate : public FromProperty { + class FromRotate : public FromProperty { public: RTTI_DECL @@ -102,7 +102,7 @@ namespace spine { float value(Skeleton &skeleton, BonePose &source, bool local, float *offsets) override; }; - class SP_API ToRotate : public ToProperty { + class ToRotate : public ToProperty { public: RTTI_DECL @@ -115,7 +115,7 @@ namespace spine { void apply(Skeleton &skeleton, TransformConstraintPose &pose, BonePose &bone, float value, bool local, bool additive) override; }; - class SP_API FromX : public FromProperty { + class FromX : public FromProperty { public: RTTI_DECL @@ -127,7 +127,7 @@ namespace spine { float value(Skeleton &skeleton, BonePose &source, bool local, float *offsets) override; }; - class SP_API ToX : public ToProperty { + class ToX : public ToProperty { public: RTTI_DECL @@ -140,7 +140,7 @@ namespace spine { void apply(Skeleton &skeleton, TransformConstraintPose &pose, BonePose &bone, float value, bool local, bool additive) override; }; - class SP_API FromY : public FromProperty { + class FromY : public FromProperty { public: RTTI_DECL @@ -152,7 +152,7 @@ namespace spine { float value(Skeleton &skeleton, BonePose &source, bool local, float *offsets) override; }; - class SP_API ToY : public ToProperty { + class ToY : public ToProperty { public: RTTI_DECL @@ -165,7 +165,7 @@ namespace spine { void apply(Skeleton &skeleton, TransformConstraintPose &pose, BonePose &bone, float value, bool local, bool additive) override; }; - class SP_API FromScaleX : public FromProperty { + class FromScaleX : public FromProperty { public: RTTI_DECL @@ -177,7 +177,7 @@ namespace spine { float value(Skeleton &skeleton, BonePose &source, bool local, float *offsets) override; }; - class SP_API ToScaleX : public ToProperty { + class ToScaleX : public ToProperty { public: RTTI_DECL @@ -190,7 +190,7 @@ namespace spine { void apply(Skeleton &skeleton, TransformConstraintPose &pose, BonePose &bone, float value, bool local, bool additive) override; }; - class SP_API FromScaleY : public FromProperty { + class FromScaleY : public FromProperty { public: RTTI_DECL @@ -202,7 +202,7 @@ namespace spine { float value(Skeleton &skeleton, BonePose &source, bool local, float *offsets) override; }; - class SP_API ToScaleY : public ToProperty { + class ToScaleY : public ToProperty { public: RTTI_DECL @@ -215,7 +215,7 @@ namespace spine { void apply(Skeleton &skeleton, TransformConstraintPose &pose, BonePose &bone, float value, bool local, bool additive) override; }; - class SP_API FromShearY : public FromProperty { + class FromShearY : public FromProperty { public: RTTI_DECL @@ -227,7 +227,7 @@ namespace spine { float value(Skeleton &skeleton, BonePose &source, bool local, float *offsets) override; }; - class SP_API ToShearY : public ToProperty { + class ToShearY : public ToProperty { public: RTTI_DECL @@ -243,7 +243,7 @@ namespace spine { /// Stores the setup pose for a TransformConstraint. /// /// See https://esotericsoftware.com/spine-transform-constraints Transform constraints in the Spine User Guide. - class SP_API TransformConstraintData : public ConstraintDataGeneric { + class TransformConstraintData : public ConstraintDataGeneric { public: RTTI_DECL static const int ROTATION; diff --git a/spine-cpp/include/spine/TransformConstraintPose.h b/spine-cpp/include/spine/TransformConstraintPose.h index f96a4944d..48b0c6084 100644 --- a/spine-cpp/include/spine/TransformConstraintPose.h +++ b/spine-cpp/include/spine/TransformConstraintPose.h @@ -35,7 +35,7 @@ namespace spine { /// Stores a pose for a transform constraint. - class SP_API TransformConstraintPose : public Pose { + class TransformConstraintPose : public Pose { friend class FromProperty; friend class ToProperty; friend class FromRotate; diff --git a/spine-cpp/include/spine/TransformConstraintTimeline.h b/spine-cpp/include/spine/TransformConstraintTimeline.h index 097f63503..d1ab5d484 100644 --- a/spine-cpp/include/spine/TransformConstraintTimeline.h +++ b/spine-cpp/include/spine/TransformConstraintTimeline.h @@ -38,7 +38,7 @@ namespace spine { /// Changes a transform constraint's TransformConstraintPose::getMixRotate(), TransformConstraintPose::getMixX(), /// TransformConstraintPose::getMixY(), TransformConstraintPose::getMixScaleX(), /// TransformConstraintPose::getMixScaleY(), and TransformConstraintPose::getMixShearY(). - class SP_API TransformConstraintTimeline : public CurveTimeline, public ConstraintTimeline { + class TransformConstraintTimeline : public CurveTimeline, public ConstraintTimeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/TranslateTimeline.h b/spine-cpp/include/spine/TranslateTimeline.h index 5b24789fe..73c4dfc13 100644 --- a/spine-cpp/include/spine/TranslateTimeline.h +++ b/spine-cpp/include/spine/TranslateTimeline.h @@ -35,7 +35,7 @@ namespace spine { /// Changes a bone's local X and Y translation. - class SP_API TranslateTimeline : public BoneTimeline2 { + class TranslateTimeline : public BoneTimeline2 { friend class SkeletonBinary; friend class SkeletonJson; @@ -50,7 +50,7 @@ namespace spine { }; /// Changes a bone's local X translation. - class SP_API TranslateXTimeline : public BoneTimeline1 { + class TranslateXTimeline : public BoneTimeline1 { friend class SkeletonBinary; friend class SkeletonJson; @@ -65,7 +65,7 @@ namespace spine { }; /// Changes a bone's local Y translation. - class SP_API TranslateYTimeline : public BoneTimeline1 { + class TranslateYTimeline : public BoneTimeline1 { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/Triangulator.h b/spine-cpp/include/spine/Triangulator.h index aa5a15400..a3e1e356c 100644 --- a/spine-cpp/include/spine/Triangulator.h +++ b/spine-cpp/include/spine/Triangulator.h @@ -34,7 +34,7 @@ #include namespace spine { - class SP_API Triangulator : public SpineObject { + class Triangulator : public SpineObject { public: ~Triangulator(); diff --git a/spine-cpp/include/spine/Update.h b/spine-cpp/include/spine/Update.h index 52fd951ec..9b33134e6 100644 --- a/spine-cpp/include/spine/Update.h +++ b/spine-cpp/include/spine/Update.h @@ -30,7 +30,7 @@ #ifndef Spine_Update_h #define Spine_Update_h -#include + #include #include #include @@ -39,7 +39,7 @@ namespace spine { class Skeleton; /// The interface for items updated by Skeleton::updateWorldTransform(). - class SP_API Update : public SpineObject { + class Update : public SpineObject { RTTI_DECL_NOPARENT public: Update(); diff --git a/spine-cpp/include/spine/VertexAttachment.h b/spine-cpp/include/spine/VertexAttachment.h index 51ef93d47..4ef3d797c 100644 --- a/spine-cpp/include/spine/VertexAttachment.h +++ b/spine-cpp/include/spine/VertexAttachment.h @@ -40,7 +40,7 @@ namespace spine { /// An attachment with vertices that are transformed by one or more bones and can be deformed by a slot's /// SlotPose::getDeform(). - class SP_API VertexAttachment : public Attachment { + class VertexAttachment : public Attachment { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/include/spine/dll.h b/spine-cpp/include/spine/dll.h deleted file mode 100644 index 2681a5381..000000000 --- a/spine-cpp/include/spine/dll.h +++ /dev/null @@ -1,51 +0,0 @@ -/****************************************************************************** - * Spine Runtimes License Agreement - * Last updated April 5, 2025. Replaces all prior versions. - * - * Copyright (c) 2013-2025, Esoteric Software LLC - * - * Integration of the Spine Runtimes into software or otherwise creating - * derivative works of the Spine Runtimes is permitted under the terms and - * conditions of Section 2 of the Spine Editor License Agreement: - * http://esotericsoftware.com/spine-editor-license - * - * Otherwise, it is permitted to integrate the Spine Runtimes into software - * or otherwise create derivative works of the Spine Runtimes (collectively, - * "Products"), provided that each user of the Products must obtain their own - * Spine Editor license and redistribution of the Products in any form must - * include this license and copyright notice. - * - * THE SPINE RUNTIMES ARE PROVIDED BY ESOTERIC SOFTWARE LLC "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL ESOTERIC SOFTWARE LLC BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, - * BUSINESS INTERRUPTION, OR LOSS OF USE, DATA, OR PROFITS) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THE SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - *****************************************************************************/ - -#ifndef SPINE_SHAREDLIB_H -#define SPINE_SHAREDLIB_H - -#ifdef _WIN32 -#define DLLIMPORT __declspec(dllimport) -#define DLLEXPORT __declspec(dllexport) -#else -#ifndef DLLIMPORT -#define DLLIMPORT -#endif -#ifndef DLLEXPORT -#define DLLEXPORT -#endif -#endif - -#ifdef SPINEPLUGIN_API -#define SP_API SPINEPLUGIN_API -#else -#define SP_API -#endif - -#endif /* SPINE_SHAREDLIB_H */ diff --git a/spine-cpp/src/spine/SkeletonJson.cpp b/spine-cpp/src/spine/SkeletonJson.cpp index d23c61adf..58da263a4 100644 --- a/spine-cpp/src/spine/SkeletonJson.cpp +++ b/spine-cpp/src/spine/SkeletonJson.cpp @@ -84,7 +84,7 @@ using namespace spine; -class SP_API Vertices : public SpineObject { +class Vertices : public SpineObject { public: Array _bones; Array _weights;