From 77d4dd5a4182913fa521c813060f9a1fb53423ab Mon Sep 17 00:00:00 2001 From: badlogic Date: Wed, 6 Jun 2018 16:46:50 +0200 Subject: [PATCH] [ue4] Modified Atlas so it exposes it's methods across shared libs. Everything in UE4 is compiling now. --- spine-cpp/spine-cpp/include/spine/Atlas.h | 18 +++++++++++++++--- .../Source/SpinePlugin/Private/SpinePlugin.cpp | 5 +++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/spine-cpp/spine-cpp/include/spine/Atlas.h b/spine-cpp/spine-cpp/include/spine/Atlas.h index 915697d99..243f02b36 100644 --- a/spine-cpp/spine-cpp/include/spine/Atlas.h +++ b/spine-cpp/spine-cpp/include/spine/Atlas.h @@ -65,7 +65,11 @@ enum TextureWrap { TextureWrap_Repeat }; -class AtlasPage : public SpineObject, public HasRendererObject { +class +#ifdef SPINE_UE4 + SPINEPLUGIN_API +#endif +AtlasPage : public SpineObject, public HasRendererObject { public: String name; Format format; @@ -83,7 +87,11 @@ public: virtual ~AtlasPage() { } }; -class AtlasRegion : public SpineObject { +class +#ifdef SPINE_UE4 + SPINEPLUGIN_API +#endif +AtlasRegion : public SpineObject { public: AtlasPage *page; String name; @@ -99,7 +107,11 @@ public: class TextureLoader; -class Atlas : public SpineObject { +class +#ifdef SPINE_UE4 + SPINEPLUGIN_API +#endif +Atlas : public SpineObject { public: Atlas(const String &path, TextureLoader *textureLoader); diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpinePlugin.cpp b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpinePlugin.cpp index 60f93f86c..c0ccd7dd9 100644 --- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpinePlugin.cpp +++ b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpinePlugin.cpp @@ -29,6 +29,7 @@ *****************************************************************************/ #include "SpinePluginPrivatePCH.h" +#include "spine/Extension.h" class FSpinePlugin : public SpinePlugin { virtual void StartupModule() override; @@ -42,5 +43,9 @@ void FSpinePlugin::StartupModule() { void FSpinePlugin::ShutdownModule() { } +spine::SpineExtension* spine::getDefaultExtension() { + return new spine::DefaultSpineExtension(); +} +