Plugins: Codecs - export startup/ shutdown methods for manual usage

OGRECave · Apr 25, 2018 · 17d4cab · 17d4cab
1 parent 8759cde
commit 17d4cab
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/PlugIns/FreeImageCodec/include/OgreFreeImageCodec.h b/PlugIns/FreeImageCodec/include/OgreFreeImageCodec.h
@@ -28,6 +28,8 @@ THE SOFTWARE.
 #ifndef _FreeImageCodec_H__
 #define _FreeImageCodec_H__
 
+#include "OgreFreeImageCodecExports.h"
+
 #include "OgreImageCodec.h"
 #include "OgrePlugin.h"
 
@@ -77,9 +79,9 @@ namespace Ogre {
         String magicNumberToFileExt(const char *magicNumberPtr, size_t maxbytes) const;
 
         /// Static method to startup FreeImage and register the FreeImage codecs
-        static void startup(void);
+        _OgreFreeImageCodecExport static void startup(void);
         /// Static method to shutdown FreeImage and unregister the FreeImage codecs
-        static void shutdown(void);
+        _OgreFreeImageCodecExport static void shutdown(void);
     };
 
     class FreeImagePlugin : public Plugin

diff --git a/PlugIns/FreeImageCodec/src/OgreFreeImageCodec.cpp b/PlugIns/FreeImageCodec/src/OgreFreeImageCodec.cpp
@@ -26,7 +26,6 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreFreeImageCodecExports.h"
 #include "OgreFreeImageCodec.h"
 
 #include <FreeImage.h>

diff --git a/PlugIns/STBICodec/include/OgreSTBICodec.h b/PlugIns/STBICodec/include/OgreSTBICodec.h
@@ -28,6 +28,7 @@ THE SOFTWARE.
 #ifndef __STBICodec_H__
 #define __STBICodec_H__
 
+#include "OgreSTBICodecExports.h"
 #include "OgreImageCodec.h"
 #include "OgrePlugin.h"
 
@@ -66,9 +67,9 @@ namespace Ogre {
         String magicNumberToFileExt(const char *magicNumberPtr, size_t maxbytes) const;
 
         /// Static method to startup and register the codecs
-        static void startup(void);
+        _OgreSTBICodecExport static void startup(void);
         /// Static method to shutdown and unregister the codecs
-        static void shutdown(void);
+        _OgreSTBICodecExport static void shutdown(void);
     };
 
     class STBIPlugin : public Plugin

diff --git a/PlugIns/STBICodec/src/OgreSTBICodec.cpp b/PlugIns/STBICodec/src/OgreSTBICodec.cpp
@@ -26,7 +26,6 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreSTBICodecExports.h"
 #include "OgreSTBICodec.h"
 #include "OgreLogManager.h"
 #include "OgreDataStream.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,6 @@ THE SOFTWARE. @@
     -----------------------------------------------------------------------------
     */
-    #include "OgreFreeImageCodecExports.h"
     #include "OgreFreeImageCodec.h"
     #include <FreeImage.h>
@@ Expand Down @@