Removing unnecessary DLL export specifiers from plugins

Source/BansheeD3D11RenderAPI/Include/BsD3D11BlendState.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/** DirectX 11 implementation of a blend state. Corresponds directly with a DX11 blend state object. */
-	class BS_D3D11_EXPORT D3D11BlendState : public BlendState
+	class D3D11BlendState : public BlendState
 	{
 	public:
 		~D3D11BlendState();

Source/BansheeD3D11RenderAPI/Include/BsD3D11DepthStencilState.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/** DirectX 11 implementation of a depth stencil state. Corresponds directly with a DX11 depth stencil state object. */
-	class BS_D3D11_EXPORT D3D11DepthStencilState : public DepthStencilState
+	class D3D11DepthStencilState : public DepthStencilState
 	{
 	public:
 		~D3D11DepthStencilState();

Source/BansheeD3D11RenderAPI/Include/BsD3D11Device.h

@@ -21,7 +21,7 @@ namespace bs { namespace ct
 	};
 
 	/**	Wrapper around DirectX 11 device object. */
-	class BS_D3D11_EXPORT D3D11Device
+	class D3D11Device
 	{
 	public:
 		/**	Constructs the object with a previously created DX11 device. */

Source/BansheeD3D11RenderAPI/Include/BsD3D11DriverList.h

@@ -11,7 +11,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	Contains a list of all available drivers. */
-	class BS_D3D11_EXPORT D3D11DriverList
+	class D3D11DriverList
 	{
 	public:
 		/**	Constructs a new driver list from an existing DXGI factory object. */

Source/BansheeD3D11RenderAPI/Include/BsD3D11EventQuery.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/** @copydoc EventQuery */
-	class BS_D3D11_EXPORT D3D11EventQuery : public EventQuery
+	class D3D11EventQuery : public EventQuery
 	{
 	public:
 		D3D11EventQuery(UINT32 deviceIdx);

Source/BansheeD3D11RenderAPI/Include/BsD3D11GpuBuffer.h

@@ -13,7 +13,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	DirectX 11 implementation of a generic GPU buffer. */
-	class BS_D3D11_EXPORT D3D11GpuBuffer : public GpuBuffer
+	class D3D11GpuBuffer : public GpuBuffer
     {
     public:
 		~D3D11GpuBuffer();

Source/BansheeD3D11RenderAPI/Include/BsD3D11GpuParamBlockBuffer.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	DirectX 11 implementation of a parameter block buffer (constant buffer in DX11 lingo). */
-	class BS_D3D11_EXPORT D3D11GpuParamBlockBuffer : public GpuParamBlockBuffer
+	class D3D11GpuParamBlockBuffer : public GpuParamBlockBuffer
 	{
 	public:
 		D3D11GpuParamBlockBuffer(UINT32 size, GpuParamBlockUsage usage, GpuDeviceFlags deviceMask);

Source/BansheeD3D11RenderAPI/Include/BsD3D11GpuProgram.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	Abstraction of a DirectX 11 shader object. */
-	class BS_D3D11_EXPORT D3D11GpuProgram : public GpuProgram
+	class D3D11GpuProgram : public GpuProgram
 	{
 	public:
 		virtual ~D3D11GpuProgram();
@@ -53,7 +53,7 @@ namespace bs { namespace ct
 	};
 
 	/**	Implementation of a DX11 vertex shader. */
-	class BS_D3D11_EXPORT D3D11GpuVertexProgram : public D3D11GpuProgram
+	class D3D11GpuVertexProgram : public D3D11GpuProgram
 	{
 	public:
 		~D3D11GpuVertexProgram();
@@ -74,7 +74,7 @@ namespace bs { namespace ct
 	};
 
 	/**	Implementation of a DX11 pixel shader. */
-	class BS_D3D11_EXPORT D3D11GpuFragmentProgram : public D3D11GpuProgram
+	class D3D11GpuFragmentProgram : public D3D11GpuProgram
 	{
 	public:
 		~D3D11GpuFragmentProgram();
@@ -95,7 +95,7 @@ namespace bs { namespace ct
 	};
 
 	/**	Implementation of a DX11 domain shader. */
-	class BS_D3D11_EXPORT D3D11GpuDomainProgram : public D3D11GpuProgram
+	class D3D11GpuDomainProgram : public D3D11GpuProgram
 	{
 	public:
 		~D3D11GpuDomainProgram();
@@ -116,7 +116,7 @@ namespace bs { namespace ct
 	};
 
 	/**	Implementation of a DX11 hull shader. */
-	class BS_D3D11_EXPORT D3D11GpuHullProgram : public D3D11GpuProgram
+	class D3D11GpuHullProgram : public D3D11GpuProgram
 	{
 	public:
 		~D3D11GpuHullProgram();
@@ -137,7 +137,7 @@ namespace bs { namespace ct
 	};
 
 	/**	Implementation of a DX11 geometry shader. */
-	class BS_D3D11_EXPORT D3D11GpuGeometryProgram : public D3D11GpuProgram
+	class D3D11GpuGeometryProgram : public D3D11GpuProgram
 	{
 	public:
 		~D3D11GpuGeometryProgram();
@@ -158,7 +158,7 @@ namespace bs { namespace ct
 	};
 
 	/**	Implementation of a DX11 compute shader. */
-	class BS_D3D11_EXPORT D3D11GpuComputeProgram : public D3D11GpuProgram
+	class D3D11GpuComputeProgram : public D3D11GpuProgram
 	{
 	public:
 		~D3D11GpuComputeProgram();

Source/BansheeD3D11RenderAPI/Include/BsD3D11HLSLProgramFactory.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	Handles creation of DirectX 11 HLSL GPU programs. */
-	class BS_D3D11_EXPORT D3D11HLSLProgramFactory : public GpuProgramFactory
+	class D3D11HLSLProgramFactory : public GpuProgramFactory
 	{
 	public:
 		D3D11HLSLProgramFactory();

Source/BansheeD3D11RenderAPI/Include/BsD3D11HardwareBuffer.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	Class containing common functionality for all DirectX 11 hardware buffers. */
-	class BS_D3D11_EXPORT D3D11HardwareBuffer : public HardwareBuffer
+	class D3D11HardwareBuffer : public HardwareBuffer
 	{
 	public:
 		/**	Available types of DX11 buffers. */

Source/BansheeD3D11RenderAPI/Include/BsD3D11HardwareBufferManager.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	Handles creation of DirectX 11 hardware buffers. */
-	class BS_D3D11_EXPORT D3D11HardwareBufferManager : public HardwareBufferManager
+	class D3D11HardwareBufferManager : public HardwareBufferManager
 	{
 	public:
 		D3D11HardwareBufferManager(D3D11Device& device);

Source/BansheeD3D11RenderAPI/Include/BsD3D11IndexBuffer.h

@@ -13,7 +13,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	DirectX 11 implementation of an index buffer. */
-	class BS_D3D11_EXPORT D3D11IndexBuffer : public IndexBuffer
+	class D3D11IndexBuffer : public IndexBuffer
 	{
 	public:
 		D3D11IndexBuffer(D3D11Device& device, const INDEX_BUFFER_DESC& desc, GpuDeviceFlags deviceMask);

Source/BansheeD3D11RenderAPI/Include/BsD3D11Mappings.h

@@ -16,7 +16,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	Helper class that maps engine types to DirectX 11 types. */
-	class BS_D3D11_EXPORT D3D11Mappings
+	class D3D11Mappings
 	{
 	public:
 		/**	Converts engine to DX11 specific texture addressing mode. */

Source/BansheeD3D11RenderAPI/Include/BsD3D11OcclusionQuery.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/** @copydoc OcclusionQuery */
-	class BS_D3D11_EXPORT D3D11OcclusionQuery : public OcclusionQuery
+	class D3D11OcclusionQuery : public OcclusionQuery
 	{
 	public:
 		D3D11OcclusionQuery(bool binary, UINT32 deviceIdx);

Source/BansheeD3D11RenderAPI/Include/BsD3D11Prerequisites.h

@@ -62,18 +62,4 @@ namespace bs { namespace ct
 	};
 
 	typedef Vector<char*> HLSLMicroCode;
-
-#if (BS_PLATFORM == BS_PLATFORM_WIN32) && !defined(BS_STATIC_LIB)
-#	ifdef BS_RSD3D11_EXPORTS
-#		define BS_D3D11_EXPORT __declspec(dllexport)
-#	else
-#       if defined( __MINGW32__ )
-#           define BS_D3D11_EXPORT
-#       else
-#    		define BS_D3D11_EXPORT __declspec(dllimport)
-#       endif
-#	endif
-#else
-#	define BS_D3D11_EXPORT
-#endif
 }}

Source/BansheeD3D11RenderAPI/Include/BsD3D11QueryManager.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	Handles creation of DirectX 11 queries. */
-	class BS_D3D11_EXPORT D3D11QueryManager : public QueryManager
+	class D3D11QueryManager : public QueryManager
 	{
 	public:
 		/** @copydoc QueryManager::createEventQuery */

Source/BansheeD3D11RenderAPI/Include/BsD3D11RasterizerState.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/** DirectX 11 implementation of a rasterizer state. Wraps a DX11 rasterizer state object. */
-	class BS_D3D11_EXPORT D3D11RasterizerState : public RasterizerState
+	class D3D11RasterizerState : public RasterizerState
 	{
 	public:
 		~D3D11RasterizerState();

Source/BansheeD3D11RenderAPI/Include/BsD3D11RenderAPI.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/** Implementation of a render system using DirectX 11. Provides abstracted access to various low level DX11 methods. */
-	class BS_D3D11_EXPORT D3D11RenderAPI : public RenderAPI
+	class D3D11RenderAPI : public RenderAPI
 	{
 	public:
 		D3D11RenderAPI();

Source/BansheeD3D11RenderAPI/Include/BsD3D11RenderStateManager.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	Handles creation of DirectX 11 pipeline states. */
-	class BS_D3D11_EXPORT D3D11RenderStateManager : public RenderStateManager
+	class D3D11RenderStateManager : public RenderStateManager
 	{
 	protected:
 		/** @copydoc RenderStateManager::createSamplerStateInternal */

Source/BansheeD3D11RenderAPI/Include/BsD3D11RenderWindow.h

@@ -11,7 +11,7 @@ namespace bs {
 	 */
 
 	/**	Contains various properties that describe a render window. */
-	class BS_D3D11_EXPORT D3D11RenderWindowProperties : public RenderWindowProperties
+	class D3D11RenderWindowProperties : public RenderWindowProperties
 	{
 	public:
 		D3D11RenderWindowProperties(const RENDER_WINDOW_DESC& desc);
@@ -27,7 +27,7 @@ namespace bs {
 	 *
 	 * @note	Sim thread only.
 	 */
-	class BS_D3D11_EXPORT D3D11RenderWindow : public RenderWindow
+	class D3D11RenderWindow : public RenderWindow
 	{
 	public:
 		~D3D11RenderWindow() { }
@@ -73,7 +73,7 @@ namespace bs {
 	 *
 	 * @note	Core thread only.
 	 */
-	class BS_D3D11_EXPORT D3D11RenderWindow : public RenderWindow
+	class D3D11RenderWindow : public RenderWindow
 	{
 	public:
 		D3D11RenderWindow(const RENDER_WINDOW_DESC& desc, UINT32 windowId,

Source/BansheeD3D11RenderAPI/Include/BsD3D11RenderWindowManager.h

@@ -12,7 +12,7 @@ namespace bs
 	 */
 
 	/** @copydoc RenderWindowManager */
-	class BS_D3D11_EXPORT D3D11RenderWindowManager : public RenderWindowManager
+	class D3D11RenderWindowManager : public RenderWindowManager
 	{
 	public:
 		D3D11RenderWindowManager(ct::D3D11RenderAPI* renderSystem);
@@ -29,7 +29,7 @@ namespace bs
 	namespace ct
 	{
 	/** @copydoc RenderWindowManager */
-	class BS_D3D11_EXPORT D3D11RenderWindowManager : public RenderWindowManager
+	class D3D11RenderWindowManager : public RenderWindowManager
 	{
 	public:
 		D3D11RenderWindowManager(D3D11RenderAPI* renderSystem);

Source/BansheeD3D11RenderAPI/Include/BsD3D11SamplerState.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	DirectX 11 implementation of a sampler state. Wraps a DX11 sampler state object. */
-	class BS_D3D11_EXPORT D3D11SamplerState : public SamplerState
+	class D3D11SamplerState : public SamplerState
 	{
 	public:
 		~D3D11SamplerState();

Source/BansheeD3D11RenderAPI/Include/BsD3D11TextureManager.h

@@ -12,7 +12,7 @@ namespace bs
 	 */
 
 	/**	Handles creation of DirectX 11 textures. */
-	class BS_D3D11_EXPORT D3D11TextureManager : public TextureManager
+	class D3D11TextureManager : public TextureManager
 	{
 	public:
 		/** @copydoc TextureManager::getNativeFormat */
@@ -26,7 +26,7 @@ namespace bs
 	namespace ct
 	{
 	/**	Handles creation of DirectX 11 textures. */
-	class BS_D3D11_EXPORT D3D11TextureManager : public TextureManager
+	class D3D11TextureManager : public TextureManager
 	{
 	protected:
 		/** @copydoc TextureManager::createTextureInternal */

Source/BansheeD3D11RenderAPI/Include/BsD3D11TextureView.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	DirectX implementation of a texture resource view. */
-	class BS_D3D11_EXPORT D3D11TextureView : public TextureView
+	class D3D11TextureView : public TextureView
 	{
 	public:
 		~D3D11TextureView();

Source/BansheeD3D11RenderAPI/Include/BsD3D11TimerQuery.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/** @copydoc TimerQuery */
-	class BS_D3D11_EXPORT D3D11TimerQuery : public TimerQuery
+	class D3D11TimerQuery : public TimerQuery
 	{
 	public:
 		D3D11TimerQuery(UINT32 deviceIdx);

Source/BansheeD3D11RenderAPI/Include/BsD3D11VertexBuffer.h

@@ -13,7 +13,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	DirectX 11 implementation of a vertex buffer. */
-	class BS_D3D11_EXPORT D3D11VertexBuffer : public VertexBuffer
+	class D3D11VertexBuffer : public VertexBuffer
 	{
 	public:
 		D3D11VertexBuffer(D3D11Device& device, const VERTEX_BUFFER_DESC& desc, GpuDeviceFlags deviceMask);

Source/BansheeD3D11RenderAPI/Include/BsD3D11VideoModeInfo.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/** @copydoc VideoMode */
-	class BS_D3D11_EXPORT D3D11VideoMode : public VideoMode
+	class D3D11VideoMode : public VideoMode
 	{
 	public:
 		D3D11VideoMode(UINT32 width, UINT32 height, float refreshRate, UINT32 outputIdx, UINT32 refreshRateNumerator,
@@ -36,7 +36,7 @@ namespace bs { namespace ct
 	};
 
 	/** @copydoc VideoOutputInfo */
-	class BS_D3D11_EXPORT D3D11VideoOutputInfo : public VideoOutputInfo
+	class D3D11VideoOutputInfo : public VideoOutputInfo
 	{
 	public:
 		D3D11VideoOutputInfo(IDXGIOutput* output, UINT32 outputIdx);
@@ -50,7 +50,7 @@ namespace bs { namespace ct
 	};
 
 	/** @copydoc VideoModeInfo */
-	class BS_D3D11_EXPORT D3D11VideoModeInfo : public VideoModeInfo
+	class D3D11VideoModeInfo : public VideoModeInfo
 	{
 	public:
 		D3D11VideoModeInfo(IDXGIAdapter* dxgiAdapter);

Source/BansheeD3D11RenderAPI/Source/BsD3D11Plugin.cpp

@@ -5,7 +5,7 @@
 
 namespace bs
 {
-	extern "C" BS_D3D11_EXPORT const char* getPluginName()
+	extern "C" BS_PLUGIN_EXPORT const char* getPluginName()
 	{
 		return ct::SystemName;
 	}

Source/BansheeFBXImporter/Include/BsFBXImporter.h

@@ -19,7 +19,7 @@ namespace bs
 	class MorphShapes;
 
 	/** Importer implementation that handles FBX/OBJ/DAE/3DS file import by using the FBX SDK. */
-	class BS_FBX_EXPORT FBXImporter : public SpecificImporter
+	class FBXImporter : public SpecificImporter
 	{
 	public:
 		FBXImporter();

Source/BansheeFBXImporter/Include/BsFBXPrerequisites.h

@@ -4,22 +4,6 @@
 
 #include "BsCorePrerequisites.h"
 
-#if (BS_PLATFORM == BS_PLATFORM_WIN32) && !defined(__MINGW32__)
-#	ifdef BS_FBX_EXPORTS
-#		define BS_FBX_EXPORT __declspec(dllexport)
-#	else
-#       if defined( __MINGW32__ )
-#           define BS_FBX_EXPORT
-#       else
-#    		define BS_FBX_EXPORT __declspec(dllimport)
-#       endif
-#	endif
-#elif defined ( BS_GCC_VISIBILITY )
-#    define BS_FBX_EXPORT  __attribute__ ((visibility("default")))
-#else
-#    define BS_FBX_EXPORT
-#endif
-
 /** @addtogroup Plugins
  *  @{
  */

Source/BansheeFBXImporter/Source/BsFBXPlugin.cpp

@@ -7,14 +7,14 @@
 namespace bs
 {
 	/**	Returns a name of the plugin. */
-	extern "C" BS_FBX_EXPORT const char* getPluginName()
+	extern "C" BS_PLUGIN_EXPORT const char* getPluginName()
 	{
 		static const char* pluginName = "FBXImporter";
 		return pluginName;
 	}
 
 	/**	Entry point to the plugin. Called by the engine when the plugin is loaded. */
-	extern "C" BS_FBX_EXPORT void* loadPlugin()
+	extern "C" BS_PLUGIN_EXPORT void* loadPlugin()
 	{
 		FBXImporter* importer = bs_new<FBXImporter>();
 		Importer::instance()._registerAssetImporter(importer);

Source/BansheeFMOD/Include/BsFMODPrerequisites.h

@@ -4,23 +4,6 @@
 
 #include "BsCorePrerequisites.h"
 
-#if (BS_PLATFORM == BS_PLATFORM_WIN32) && !defined(__MINGW32__)
-#	ifdef BS_FMOD_EXPORTS
-#		define BS_FMOD_EXPORT __declspec(dllexport)
-#	else
-#       if defined( __MINGW32__ )
-#           define BS_FMOD_EXPORT
-#       else
-#    		define BS_FMOD_EXPORT __declspec(dllimport)
-#       endif
-#	endif
-#elif defined (BS_GCC_VISIBILITY)
-#    define BS_FMOD_EXPORT  __attribute__ ((visibility("default")))
-#else
-#    define BS_FMOD_EXPORT
-#endif
-
-
 namespace bs
 {
 	class FMODAudioListener;

Source/BansheeFMOD/Source/BsFMODPlugin.cpp

@@ -23,14 +23,14 @@ namespace bs
 	};
 
 	/**	Returns a name of the plugin. */
-	extern "C" BS_FMOD_EXPORT const char* getPluginName()
+	extern "C" BS_PLUGIN_EXPORT const char* getPluginName()
 	{
 		static const char* pluginName = "BansheeFMOD";
 		return pluginName;
 	}
 
 	/**	Entry point to the plugin. Called by the engine when the plugin is loaded. */
-	extern "C" BS_FMOD_EXPORT void* loadPlugin()
+	extern "C" BS_PLUGIN_EXPORT void* loadPlugin()
 	{
 		FMODImporter* importer = bs_new<FMODImporter>();
 		Importer::instance()._registerAssetImporter(importer);
@@ -39,7 +39,7 @@ namespace bs
 	}
 
 	/**	Exit point of the plugin. Called by the engine before the plugin is unloaded. */
-	extern "C" BS_FMOD_EXPORT void unloadPlugin(FMODFactory* instance)
+	extern "C" BS_PLUGIN_EXPORT void unloadPlugin(FMODFactory* instance)
 	{
 		bs_delete(instance);
 	}

Source/BansheeFontImporter/Include/BsFontImporter.h

@@ -13,23 +13,23 @@ namespace bs
 	 */
 
 	/** Importer implementation that handles font import by using the FreeType library. */
-	class BS_FONT_EXPORT FontImporter : public SpecificImporter
+	class FontImporter : public SpecificImporter
 	{
 	public:
 		FontImporter();
 		virtual ~FontImporter();
 
 		/** @copydoc SpecificImporter::isExtensionSupported */
-		virtual bool isExtensionSupported(const WString& ext) const override;
+		bool isExtensionSupported(const WString& ext) const override;
 
 		/** @copydoc SpecificImporter::isMagicNumberSupported */
-		virtual bool isMagicNumberSupported(const UINT8* magicNumPtr, UINT32 numBytes) const override;
+		bool isMagicNumberSupported(const UINT8* magicNumPtr, UINT32 numBytes) const override;
 
 		/** @copydoc SpecificImporter::import */
-		virtual SPtr<Resource> import(const Path& filePath, SPtr<const ImportOptions> importOptions) override;
+		SPtr<Resource> import(const Path& filePath, SPtr<const ImportOptions> importOptions) override;
 
 		/** @copydoc SpecificImporter::createImportOptions */
-		virtual SPtr<ImportOptions> createImportOptions() const override;
+		SPtr<ImportOptions> createImportOptions() const override;
 	private:
 		Vector<WString> mExtensions;
 

Source/BansheeFontImporter/Include/BsFontPrerequisites.h

@@ -4,22 +4,6 @@
 
 #include "BsCorePrerequisites.h"
 
-#if (BS_PLATFORM == BS_PLATFORM_WIN32) && !defined(__MINGW32__)
-#	ifdef BS_FONT_EXPORTS
-#		define BS_FONT_EXPORT __declspec(dllexport)
-#	else
-#       if defined( __MINGW32__ )
-#           define BS_FONT_EXPORT
-#       else
-#    		define BS_FONT_EXPORT __declspec(dllimport)
-#       endif
-#	endif
-#elif defined ( BS_GCC_VISIBILITY )
-#    define BS_FONT_EXPORT  __attribute__ ((visibility("default")))
-#else
-#    define BS_FONT_EXPORT
-#endif
-
 /** @addtogroup Plugins
  *  @{
  */

Source/BansheeFontImporter/Source/BsFontPlugin.cpp

@@ -7,14 +7,14 @@
 namespace bs
 {
 	/**	Returns a name of the plugin. */
-	extern "C" BS_FONT_EXPORT const char* getPluginName()
+	extern "C" BS_PLUGIN_EXPORT const char* getPluginName()
 	{
 		static const char* pluginName = "FontImporter";
 		return pluginName;
 	}
 
 	/**	Entry point to the plugin. Called by the engine when the plugin is loaded. */
-	extern "C" BS_FONT_EXPORT void* loadPlugin()
+	extern "C" BS_PLUGIN_EXPORT void* loadPlugin()
 	{
 		FontImporter* importer = bs_new<FontImporter>();
 		Importer::instance()._registerAssetImporter(importer);

Source/BansheeFreeImgImporter/Include/BsFreeImgPrerequisites.h

@@ -4,22 +4,6 @@
 
 #include "BsCorePrerequisites.h"
 
-#if (BS_PLATFORM == BS_PLATFORM_WIN32) && !defined(__MINGW32__)
-#	ifdef BS_FREEIMG_EXPORTS
-#		define BS_FREEIMG_EXPORT __declspec(dllexport)
-#	else
-#       if defined( __MINGW32__ )
-#           define BS_FREEIMG_EXPORT
-#       else
-#    		define BS_FREEIMG_EXPORT __declspec(dllimport)
-#       endif
-#	endif
-#elif defined ( BS_GCC_VISIBILITY )
-#    define BS_FREEIMG_EXPORT  __attribute__ ((visibility("default")))
-#else
-#    define BS_FREEIMG_EXPORT
-#endif
-
 /** @addtogroup Plugins
  *  @{
  */

Source/BansheeFreeImgImporter/Source/BsFreeImgPlugin.cpp

@@ -5,13 +5,13 @@
 
 namespace bs
 {
-	extern "C" BS_FREEIMG_EXPORT const char* getPluginName()
+	extern "C" BS_PLUGIN_EXPORT const char* getPluginName()
 	{
 		static const char* pluginName = "FreeImageImporter";
 		return pluginName;
 	}
 
-	extern "C" BS_FREEIMG_EXPORT void* loadPlugin()
+	extern "C" BS_PLUGIN_EXPORT void* loadPlugin()
 	{
 		FreeImgImporter* importer = bs_new<FreeImgImporter>();
 		Importer::instance()._registerAssetImporter(importer);

Source/BansheeGLRenderAPI/Include/BsGLBuffer.h

@@ -13,7 +13,7 @@ namespace bs { namespace ct
 	 */
 
 	/** Wrapper around a generic OpenGL buffer. */
-    class BS_RSGL_EXPORT GLBuffer
+    class GLBuffer
     {
     public:
 		/** Creates an uninitialized buffer object. You must call initialize() before using it. */

Source/BansheeGLRenderAPI/Include/BsGLContext.h

@@ -13,7 +13,7 @@ namespace bs { namespace ct
 	/**
 	 * Abstract class that encapsulated an OpenGL context. Each platform should provide its own GLContext specialization.
 	 */
-    class BS_RSGL_EXPORT GLContext
+    class GLContext
     {
     public:
         GLContext();

Source/BansheeGLRenderAPI/Include/BsGLEventQuery.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/** @copydoc EventQuery */
-	class BS_RSGL_EXPORT GLEventQuery : public EventQuery
+	class GLEventQuery : public EventQuery
 	{
 	public:
 		GLEventQuery(UINT32 deviceIdx);

Source/BansheeGLRenderAPI/Include/BsGLFrameBufferObject.h

@@ -14,7 +14,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	Describes OpenGL frame buffer surface. */
-    struct BS_RSGL_EXPORT GLSurfaceDesc
+    struct GLSurfaceDesc
     {
     public:
 		GLSurfaceDesc() 
@@ -31,7 +31,7 @@ namespace bs { namespace ct
 	 * Manages an OpenGL frame-buffer object. Frame buffer object is used as a rendering destination in the render system
 	 * pipeline, and it may consist out of one or multiple color surfaces and an optional depth/stencil surface.
 	 */
-    class BS_RSGL_EXPORT GLFrameBufferObject
+    class GLFrameBufferObject
     {
     public:
         GLFrameBufferObject();

Source/BansheeGLRenderAPI/Include/BsGLGpuBuffer.h

@@ -13,7 +13,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	OpenGL implementation of a generic GPU buffer. */
-	class BS_RSGL_EXPORT GLGpuBuffer : public GpuBuffer
+	class GLGpuBuffer : public GpuBuffer
 	{
 	public:
 		~GLGpuBuffer();

Source/BansheeGLRenderAPI/Include/BsGLGpuParamBlockBuffer.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	OpenGL implementation of a GPU parameter buffer (Uniform buffer). */
-	class BS_RSGL_EXPORT GLGpuParamBlockBuffer : public GpuParamBlockBuffer
+	class GLGpuParamBlockBuffer : public GpuParamBlockBuffer
 	{
 	public:
 		GLGpuParamBlockBuffer(UINT32 size, GpuParamBlockUsage usage, GpuDeviceFlags deviceMask);

Source/BansheeGLRenderAPI/Include/BsGLHardwareBufferManager.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	Handles creation of OpenGL specific hardware buffers. */
-    class BS_RSGL_EXPORT GLHardwareBufferManager : public HardwareBufferManager
+    class GLHardwareBufferManager : public HardwareBufferManager
     {
     public:
 		/**	Converts engine buffer usage flags into OpenGL specific flags. */

Source/BansheeGLRenderAPI/Include/BsGLIndexBuffer.h

@@ -13,7 +13,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	OpenGL implementation of an index buffer. */
-    class BS_RSGL_EXPORT GLIndexBuffer : public IndexBuffer
+    class GLIndexBuffer : public IndexBuffer
     {
     public:
 		GLIndexBuffer(const INDEX_BUFFER_DESC& desc, GpuDeviceFlags deviceMask);

Source/BansheeGLRenderAPI/Include/BsGLOcclusionQuery.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	OpenGL implementation of an occlusion query. */
-	class BS_RSGL_EXPORT GLOcclusionQuery : public OcclusionQuery
+	class GLOcclusionQuery : public OcclusionQuery
 	{
 	public:
 		GLOcclusionQuery(bool binary, UINT32 deviceIdx);

Source/BansheeGLRenderAPI/Include/BsGLPixelFormat.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	Converts pixel formats to OpenGL formats */
-	class BS_RSGL_EXPORT GLPixelUtil
+	class GLPixelUtil
 	{
 	public:
 		/**	Finds the closest pixel format that OpenGL supports. */

Source/BansheeGLRenderAPI/Include/BsGLPrerequisites.h

@@ -43,22 +43,6 @@
 #define _CRT_SECURE_NO_DEPRECATE
 #endif
 
-#if (BS_PLATFORM == BS_PLATFORM_WIN32) && !defined(__MINGW32__) && !defined(BS_STATIC_LIB)
-#	ifdef BS_RSGL_EXPORTS
-#		define BS_RSGL_EXPORT __declspec(dllexport)
-#	else
-#       if defined( __MINGW32__ )
-#           define BS_RSGL_EXPORT
-#       else
-#    		define BS_RSGL_EXPORT __declspec(dllimport)
-#       endif
-#	endif
-#elif defined ( BS_GCC_VISIBILITY )
-#    define BS_RSGL_EXPORT  __attribute__ ((visibility("default")))
-#else
-#    define BS_RSGL_EXPORT
-#endif
-
 /** @addtogroup Plugins
  *  @{
  */

Source/BansheeGLRenderAPI/Include/BsGLQueryManager.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	Handles creation and life of OpenGL queries. */
-	class BS_RSGL_EXPORT GLQueryManager : public QueryManager
+	class GLQueryManager : public QueryManager
 	{
 	public:
 		/** @copydoc QueryManager::createEventQuery */

Source/BansheeGLRenderAPI/Include/BsGLRenderAPI.h

@@ -15,7 +15,7 @@ namespace bs { namespace ct
 	 */
 
 	/** Implementation of a render system using OpenGL. Provides abstracted access to various low level OpenGL methods. */
-    class BS_RSGL_EXPORT GLRenderAPI : public RenderAPI
+    class GLRenderAPI : public RenderAPI
     {
     public:
         GLRenderAPI();

Source/BansheeGLRenderAPI/Include/BsGLRenderTexture.h

@@ -43,7 +43,7 @@ namespace bs
 	 *
 	 * @note	Core thread only.
 	 */
-    class BS_RSGL_EXPORT GLRenderTexture : public RenderTexture
+    class GLRenderTexture : public RenderTexture
     {
 	public:
 		GLRenderTexture(const RENDER_TEXTURE_DESC& desc, UINT32 deviceIdx);
@@ -70,7 +70,7 @@ namespace bs
      * 			
 	 * @note	Must be initialized when RenderSystem is first started.
      */
-    class BS_RSGL_EXPORT GLRTTManager : public Module<GLRTTManager>
+    class GLRTTManager : public Module<GLRTTManager>
     {
     public:
         GLRTTManager();

Source/BansheeGLRenderAPI/Include/BsGLRenderWindowManager.h

@@ -12,7 +12,7 @@ namespace bs
 	 */
 
 	/**	Manager that handles window creation for OpenGL. */
-	class BS_RSGL_EXPORT GLRenderWindowManager : public RenderWindowManager
+	class GLRenderWindowManager : public RenderWindowManager
 	{
 	public:
 		GLRenderWindowManager(ct::GLRenderAPI* renderSystem);
@@ -28,7 +28,7 @@ namespace bs
 	namespace ct
 	{
 	/**	Manager that handles window creation for OpenGL. */
-	class BS_RSGL_EXPORT GLRenderWindowManager : public RenderWindowManager
+	class GLRenderWindowManager : public RenderWindowManager
 	{
 	public:
 		GLRenderWindowManager(GLRenderAPI* renderSystem);

Source/BansheeGLRenderAPI/Include/BsGLSupport.h

@@ -16,7 +16,7 @@ namespace bs { namespace ct
 	 * Helper class dealing mostly with platform specific OpenGL functionality, initialization, extensions and window
 	 * creation.
 	 */
-	class BS_RSGL_EXPORT GLSupport
+	class GLSupport
 	{
 	public:
 		GLSupport() { }

Source/BansheeGLRenderAPI/Include/BsGLTexture.h

@@ -13,7 +13,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	OpenGL implementation of a texture. */
-    class BS_RSGL_EXPORT GLTexture : public Texture
+    class GLTexture : public Texture
     {
     public:
 		virtual ~GLTexture();

Source/BansheeGLRenderAPI/Include/BsGLTextureManager.h

@@ -14,7 +14,7 @@ namespace bs
 	 */
 
 	/**	Handles creation of OpenGL textures. */
-    class BS_RSGL_EXPORT GLTextureManager : public TextureManager
+    class GLTextureManager : public TextureManager
     {
     public:
         GLTextureManager(ct::GLSupport& support);
@@ -35,7 +35,7 @@ namespace bs
 	namespace ct
 	{
 	/** Handles creation of OpenGL textures. */
-	class BS_RSGL_EXPORT GLTextureManager : public TextureManager
+	class GLTextureManager : public TextureManager
 	{
 	public:
 		GLTextureManager(GLSupport& support);

Source/BansheeGLRenderAPI/Include/BsGLTimerQuery.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	OpenGL implementation of a timer query. */
-	class BS_RSGL_EXPORT GLTimerQuery : public TimerQuery
+	class GLTimerQuery : public TimerQuery
 	{
 	public:
 		GLTimerQuery(UINT32 deviceIdx);

Source/BansheeGLRenderAPI/Include/BsGLVertexArrayObjectManager.h

@@ -15,7 +15,7 @@ namespace bs { namespace ct
 	 * Vertex array object that contains vertex buffer object bindings and vertex attribute pointers for a specific set of
 	 * vertex buffers and a vertex declaration.
 	 */
-	class BS_RSGL_EXPORT GLVertexArrayObject
+	class GLVertexArrayObject
 	{
 	private:
 		/**	Generates hash value for the VAO object. */
@@ -52,7 +52,7 @@ namespace bs { namespace ct
 	};
 
 	/**	Manager that handles creation and destruction of vertex array objects. */
-	class BS_RSGL_EXPORT GLVertexArrayObjectManager : public Module<GLVertexArrayObjectManager>
+	class GLVertexArrayObjectManager : public Module<GLVertexArrayObjectManager>
 	{
 	public:
 		~GLVertexArrayObjectManager();

Source/BansheeGLRenderAPI/Include/BsGLVertexBuffer.h

@@ -14,7 +14,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	OpenGL implementation of a vertex buffer. */
-    class BS_RSGL_EXPORT GLVertexBuffer : public VertexBuffer
+    class GLVertexBuffer : public VertexBuffer
     {
     public:
 		GLVertexBuffer(const VERTEX_BUFFER_DESC& desc, GpuDeviceFlags deviceMask);

Source/BansheeGLRenderAPI/Include/Win32/BsWin32Context.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	Windows specific implementation of an OpenGL context. */
-    class BS_RSGL_EXPORT Win32Context : public GLContext
+    class Win32Context : public GLContext
     {
     public:
 		/**

Source/BansheeGLRenderAPI/Include/Win32/BsWin32GLSupport.h

@@ -13,7 +13,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	Handles OpenGL initialization, window creation and extensions on Windows. */
-	class BS_RSGL_EXPORT Win32GLSupport : public GLSupport
+	class Win32GLSupport : public GLSupport
 	{
 	public:
         Win32GLSupport();

Source/BansheeGLRenderAPI/Include/Win32/BsWin32RenderWindow.h

@@ -12,7 +12,7 @@ namespace bs
 	 */
 
 	/**	Contains various properties that describe a render window. */
-	class BS_RSGL_EXPORT Win32RenderWindowProperties : public RenderWindowProperties
+	class Win32RenderWindowProperties : public RenderWindowProperties
 	{
 	public:
 		Win32RenderWindowProperties(const RENDER_WINDOW_DESC& desc);
@@ -28,7 +28,7 @@ namespace bs
 	 *
 	 * @note	Sim thread only.
 	 */
-	class BS_RSGL_EXPORT Win32RenderWindow : public RenderWindow
+	class Win32RenderWindow : public RenderWindow
 	{
 	public:
 		~Win32RenderWindow() { }
@@ -73,7 +73,7 @@ namespace bs
 	 *
 	 * @note	Core thread only.
 	 */
-    class BS_RSGL_EXPORT Win32RenderWindow : public RenderWindow
+    class Win32RenderWindow : public RenderWindow
     {
     public:
 		Win32RenderWindow(const RENDER_WINDOW_DESC& desc, UINT32 windowId, Win32GLSupport &glsupport);

Source/BansheeGLRenderAPI/Include/Win32/BsWin32VideoModeInfo.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/** @copydoc VideoMode */
-	class BS_RSGL_EXPORT Win32VideoMode : public VideoMode
+	class Win32VideoMode : public VideoMode
 	{
 	public:
 		Win32VideoMode(UINT32 width, UINT32 height, float refreshRate, UINT32 outputIdx);
@@ -22,7 +22,7 @@ namespace bs { namespace ct
 	};
 
 	/** @copydoc VideoOutputInfo */
-	class BS_RSGL_EXPORT Win32VideoOutputInfo : public VideoOutputInfo
+	class Win32VideoOutputInfo : public VideoOutputInfo
 	{
 	public:
 		Win32VideoOutputInfo(HMONITOR monitorHandle, UINT32 outputIdx);
@@ -35,7 +35,7 @@ namespace bs { namespace ct
 	};
 
 	/** @copydoc VideoModeInfo */
-	class BS_RSGL_EXPORT Win32VideoModeInfo : public VideoModeInfo
+	class Win32VideoModeInfo : public VideoModeInfo
 	{
 	public:
 		Win32VideoModeInfo();

Source/BansheeGLRenderAPI/Source/BsGLPlugin.cpp

@@ -3,7 +3,7 @@
 
 namespace bs
 {
-	extern "C" BS_RSGL_EXPORT const char* getPluginName()
+	extern "C" BS_PLUGIN_EXPORT const char* getPluginName()
 	{
 		return ct::SystemName;
 	}

Source/BansheeGLRenderAPI/Source/GLSL/include/BsGLSLGpuProgram.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	GPU program compiled from GLSL and usable by OpenGL. */
-    class BS_RSGL_EXPORT GLSLGpuProgram : public GpuProgram
+    class GLSLGpuProgram : public GpuProgram
     {
 	public:
 		~GLSLGpuProgram();

Source/BansheeGLRenderAPI/Source/GLSL/include/BsGLSLProgramFactory.h

@@ -12,7 +12,7 @@ namespace bs { namespace ct
 	 */
 
 	/**	Factory class that deals with creating GLSL GPU programs. */
-    class BS_RSGL_EXPORT GLSLProgramFactory : public GpuProgramFactory
+    class GLSLProgramFactory : public GpuProgramFactory
     {
     public:
 		/** @copydoc GpuProgramFactory::getLanguage */

Source/BansheeMono/Include/BsMonoPrerequisites.h

@@ -4,20 +4,33 @@
 
 #include "BsPrerequisites.h"
 
-#if (BS_PLATFORM == BS_PLATFORM_WIN32) && !defined(__MINGW32__)
-#	ifdef BS_MONO_EXPORTS
-#		define BS_MONO_EXPORT __declspec(dllexport)
-#	else
-#       if defined( __MINGW32__ )
-#           define BS_MONO_EXPORT
-#       else
-#    		define BS_MONO_EXPORT __declspec(dllimport)
-#       endif
-#	endif
-#elif defined ( BS_GCC_VISIBILITY )
-#    define BS_MONO_EXPORT  __attribute__ ((visibility("default")))
-#else
-#    define BS_MONO_EXPORT
+// DLL export
+#if BS_PLATFORM == BS_PLATFORM_WIN32 // Windows
+#  if BS_COMPILER == BS_COMPILER_MSVC
+#    if defined(BS_STATIC_LIB)
+#      define BS_MONO_EXPORT
+#    else
+#      if defined(BS_MONO_EXPORTS)
+#        define BS_MONO_EXPORT __declspec(dllexport)
+#      else
+#        define BS_MONO_EXPORT __declspec(dllimport)
+#      endif
+#	 endif
+#  else
+#    if defined(BS_STATIC_LIB)
+#      define BS_MONO_EXPORT
+#    else
+#      if defined(BS_MONO_EXPORTS)
+#        define BS_MONO_EXPORT __attribute__ ((dllexport))
+#      else
+#        define BS_MONO_EXPORT __attribute__ ((dllimport))
+#      endif
+#	 endif
+#  endif
+#  define BS_MONO_HIDDEN
+#else // Linux/Mac settings
+#  define BS_MONO_EXPORT __attribute__ ((visibility ("default")))
+#  define BS_MONO_HIDDEN __attribute__ ((visibility ("hidden")))
 #endif
 
 /** @addtogroup Plugins

Source/BansheeOISInput/Include/BsInputHandlerOIS.h

@@ -20,19 +20,19 @@ namespace bs
 	class InputHandlerOIS;
 
 	/**	Listens for events from a specific OIS joystick device. */
-	class BS_OIS_EXPORT GamepadEventListener : public OIS::JoyStickListener
+	class GamepadEventListener : public OIS::JoyStickListener
 	{
 	public:
 		GamepadEventListener(InputHandlerOIS* parentHandler, UINT32 joystickIdx);
 
 		/**	Called by OIS whenever a gamepad/joystick button is pressed. */
-		virtual bool buttonPressed(const OIS::JoyStickEvent& arg, int button) override;
+		bool buttonPressed(const OIS::JoyStickEvent& arg, int button) override;
 
 		/**	Called by OIS whenever a gamepad/joystick button is released. */
-		virtual bool buttonReleased(const OIS::JoyStickEvent& arg, int button) override;
+		bool buttonReleased(const OIS::JoyStickEvent& arg, int button) override;
 
 		/**	Called by OIS whenever a gamepad/joystick axis is moved. */
-		virtual bool axisMoved(const OIS::JoyStickEvent& arg, int axis) override;
+		bool axisMoved(const OIS::JoyStickEvent& arg, int axis) override;
 
 	private:
 		UINT32 mGamepadIdx;
@@ -40,7 +40,7 @@ namespace bs
 	};
 
 	/**	Raw input handler using OIS library for acquiring input. */
-	class BS_OIS_EXPORT InputHandlerOIS : public RawInputHandler, public OIS::KeyListener, 
+	class InputHandlerOIS : public RawInputHandler, public OIS::KeyListener, 
 		public OIS::MouseListener
 	{
 		/**	Holding data about an active gamepad object. */
@@ -56,19 +56,19 @@ namespace bs
 
 	private:
 		/**	Called by OIS whenever a keyboard button is pressed. */
-		virtual bool keyPressed(const OIS::KeyEvent& arg) override;
+		bool keyPressed(const OIS::KeyEvent& arg) override;
 
 		/**	Called by OIS whenever a keyboard button is released. */
-		virtual bool keyReleased(const OIS::KeyEvent& arg) override;
+		bool keyReleased(const OIS::KeyEvent& arg) override;
 
 		/**	Called by OIS whenever mouse is moved. */
-		virtual bool mouseMoved(const OIS::MouseEvent& arg) override;
+		bool mouseMoved(const OIS::MouseEvent& arg) override;
 
 		/**	Called by OIS whenever is a mouse button pressed. */
-		virtual bool mousePressed(const OIS::MouseEvent& arg, OIS::MouseButtonID id) override;
+		bool mousePressed(const OIS::MouseEvent& arg, OIS::MouseButtonID id) override;
 
 		/**	Called by OIS whenever is a mouse button released. */
-		virtual bool mouseReleased(const OIS::MouseEvent& arg, OIS::MouseButtonID id) override;
+		bool mouseReleased(const OIS::MouseEvent& arg, OIS::MouseButtonID id) override;
 
 		/**	Converts an OIS key code into engine button code. */
 		static ButtonCode keyCodeToButtonCode(OIS::KeyCode keyCode);
@@ -84,10 +84,10 @@ namespace bs
 		 */
 
 		/** Called once per frame. */
-		virtual void _update() override;
+		void _update() override;
 
 		/** Called whenever the currently focused window changes. */
-		virtual void _inputWindowChanged(const RenderWindow& win) override;
+		void _inputWindowChanged(const RenderWindow& win) override;
 
 		/** @} */
 

Source/BansheeOISInput/Include/BsOISPrerequisites.h

@@ -4,22 +4,6 @@
 
 #include "BsCorePrerequisites.h"
 
-#if (BS_PLATFORM == BS_PLATFORM_WIN32) && !defined(__MINGW32__)
-#	ifdef BS_OIS_EXPORTS
-#		define BS_OIS_EXPORT __declspec(dllexport)
-#	else
-#       if defined( __MINGW32__ )
-#           define BS_OIS_EXPORT
-#       else
-#    		define BS_OIS_EXPORT __declspec(dllimport)
-#       endif
-#	endif
-#elif defined ( BS_GCC_VISIBILITY )
-#    define BS_OIS_EXPORT  __attribute__ ((visibility("default")))
-#else
-#    define BS_OIS_EXPORT
-#endif
-
 /** @addtogroup Plugins
  *  @{
  */

Source/BansheeOISInput/Source/BsOISPlugin.cpp

@@ -8,14 +8,14 @@
 namespace bs
 {
 	/**	Returns a name of the plugin. */
-	extern "C" BS_OIS_EXPORT const char* getPluginName()
+	extern "C" BS_PLUGIN_EXPORT const char* getPluginName()
 	{
 		static const char* pluginName = "OISInput";
 		return pluginName;
 	}
 
 	/**	Entry point to the plugin. Called by the engine when the plugin is loaded. */
-	extern "C" BS_OIS_EXPORT void* loadPlugin(void* primaryWindowPtr)
+	extern "C" BS_PLUGIN_EXPORT void* loadPlugin(void* primaryWindowPtr)
 	{
 		RenderWindow* primaryWindow = (RenderWindow*)primaryWindowPtr;
 

Source/BansheeOpenAudio/Include/BsOAPrerequisites.h

@@ -4,22 +4,6 @@
 
 #include "BsCorePrerequisites.h"
 
-#if (BS_PLATFORM == BS_PLATFORM_WIN32) && !defined(__MINGW32__)
-#	ifdef BS_OA_EXPORTS
-#		define BS_OA_EXPORT __declspec(dllexport)
-#	else
-#       if defined( __MINGW32__ )
-#           define BS_OA_EXPORT
-#       else
-#    		define BS_OA_EXPORT __declspec(dllimport)
-#       endif
-#	endif
-#elif defined ( BS_GCC_VISIBILITY )
-#    define BS_OA_EXPORT  __attribute__ ((visibility("default")))
-#else
-#    define BS_OA_EXPORT
-#endif
-
 namespace bs
 {
 	class OAAudioListener;

Source/BansheeOpenAudio/Source/BsOAPlugin.cpp

@@ -23,14 +23,14 @@ namespace bs
 	};
 
 	/**	Returns a name of the plugin. */
-	extern "C" BS_OA_EXPORT const char* getPluginName()
+	extern "C" BS_PLUGIN_EXPORT const char* getPluginName()
 	{
 		static const char* pluginName = "OpenAudio";
 		return pluginName;
 	}
 
 	/**	Entry point to the plugin. Called by the engine when the plugin is loaded. */
-	extern "C" BS_OA_EXPORT void* loadPlugin()
+	extern "C" BS_PLUGIN_EXPORT void* loadPlugin()
 	{
 		OAImporter* importer = bs_new<OAImporter>();
 		Importer::instance()._registerAssetImporter(importer);
@@ -39,7 +39,7 @@ namespace bs
 	}
 
 	/**	Exit point of the plugin. Called by the engine before the plugin is unloaded. */
-	extern "C" BS_OA_EXPORT void unloadPlugin(OAFactory* instance)
+	extern "C" BS_PLUGIN_EXPORT void unloadPlugin(OAFactory* instance)
 	{
 		bs_delete(instance);
 	}

Source/BansheePhysX/Include/BsFPhysXJoint.h

@@ -13,7 +13,7 @@ namespace bs
 	 */
 
 	/** PhysX implementation of an FJoint. */
-	class BS_PHYSX_EXPORT FPhysXJoint : public FJoint
+	class FPhysXJoint : public FJoint
 	{
 	public:
 		FPhysXJoint(physx::PxJoint* joint, const JOINT_DESC& desc);

Source/BansheePhysX/Include/BsPhysXD6Joint.h

@@ -14,7 +14,7 @@ namespace bs
 	 */
 
 	/** PhysX implementation of a D6 joint. */
-	class BS_PHYSX_EXPORT PhysXD6Joint : public D6Joint
+	class PhysXD6Joint : public D6Joint
 	{
 	public:
 		PhysXD6Joint(physx::PxPhysics* physx, const D6_JOINT_DESC& desc);

Source/BansheePhysX/Include/BsPhysXDistanceJoint.h

@@ -14,7 +14,7 @@ namespace bs
 	 */
 
 	/** PhysX implementation of a DistanceJoint */
-	class BS_PHYSX_EXPORT PhysXDistanceJoint : public DistanceJoint
+	class PhysXDistanceJoint : public DistanceJoint
 	{
 	public:
 		PhysXDistanceJoint(physx::PxPhysics* physx, const DISTANCE_JOINT_DESC& desc);

Source/BansheePhysX/Include/BsPhysXFixedJoint.h

@@ -13,7 +13,7 @@ namespace bs
 	 */
 
 	/** PhysX implementation of a FixedJoint. */
-	class BS_PHYSX_EXPORT PhysXFixedJoint : public FixedJoint
+	class PhysXFixedJoint : public FixedJoint
 	{
 	public:
 		PhysXFixedJoint(physx::PxPhysics* physx, const FIXED_JOINT_DESC& desc);

Source/BansheePhysX/Include/BsPhysXHingeJoint.h

@@ -14,7 +14,7 @@ namespace bs
 	 */
 
 	/** PhysX implementation of a HingeJoint. */
-	class BS_PHYSX_EXPORT PhysXHingeJoint : public HingeJoint
+	class PhysXHingeJoint : public HingeJoint
 	{
 	public:
 		PhysXHingeJoint(physx::PxPhysics* physx, const HINGE_JOINT_DESC& desc);

Source/BansheePhysX/Include/BsPhysXMeshRTTI.h

@@ -14,7 +14,7 @@ namespace bs
 	 *  @{
 	 */
 
-	class BS_PHYSX_EXPORT FPhysXMeshRTTI : public RTTIType<FPhysXMesh, FPhysicsMesh, FPhysXMeshRTTI>
+	class FPhysXMeshRTTI : public RTTIType<FPhysXMesh, FPhysicsMesh, FPhysXMeshRTTI>
 	{
 	private:
 		SPtr<DataStream> getCookedData(FPhysXMesh* obj, UINT32& size)

Source/BansheePhysX/Include/BsPhysXPrerequisites.h

@@ -10,20 +10,6 @@
 
 namespace bs
 {
-#if (BS_PLATFORM == BS_PLATFORM_WIN32) && !defined(BS_STATIC_LIB)
-#	ifdef BS_PHYSX_EXPORTS
-#		define BS_PHYSX_EXPORT __declspec(dllexport)
-#	else
-#       if defined( __MINGW32__ )
-#           define BS_PHYSX_EXPORT
-#       else
-#    		define BS_PHYSX_EXPORT __declspec(dllimport)
-#       endif
-#	endif
-#else
-#	define BS_PHYSX_EXPORT
-#endif
-
 /** @addtogroup Plugins
  *  @{
  */

Source/BansheePhysX/Include/BsPhysXSliderJoint.h

@@ -14,7 +14,7 @@ namespace bs
 	 */
 
 	/** PhysX implementation of a SliderJoint. */
-	class BS_PHYSX_EXPORT PhysXSliderJoint : public SliderJoint
+	class PhysXSliderJoint : public SliderJoint
 	{
 	public:
 		PhysXSliderJoint(physx::PxPhysics* physx, const SLIDER_JOINT_DESC& desc);

Source/BansheePhysX/Include/BsPhysXSphericalJoint.h

@@ -14,7 +14,7 @@ namespace bs
 	 */
 
 	/** PhysX implementation of a SphericalJoint. */
-	class BS_PHYSX_EXPORT PhysXSphericalJoint : public SphericalJoint
+	class PhysXSphericalJoint : public SphericalJoint
 	{
 	public:
 		PhysXSphericalJoint(physx::PxPhysics* physx, const SPHERICAL_JOINT_DESC& desc);

Source/BansheePhysX/Source/BsPhysXPlugin.cpp

@@ -4,7 +4,7 @@
 
 namespace bs
 {
-	class BS_PHYSX_EXPORT PhysXFactory : public PhysicsFactory
+	class BS_PLUGIN_EXPORT PhysXFactory : public PhysicsFactory
 	{
 	public:
 		void startUp(bool cooking) override
@@ -21,12 +21,12 @@ namespace bs
 		}
 	};
 
-	extern "C" BS_PHYSX_EXPORT PhysXFactory* loadPlugin()
+	extern "C" BS_PLUGIN_EXPORT PhysXFactory* loadPlugin()
 	{
 		return bs_new<PhysXFactory>();
 	}
 
-	extern "C" BS_PHYSX_EXPORT void unloadPlugin(PhysXFactory* instance)
+	extern "C" BS_PLUGIN_EXPORT void unloadPlugin(PhysXFactory* instance)
 	{
 		bs_delete(instance);
 	}

Source/BansheeSL/Include/BsSLImporter.h

@@ -15,7 +15,7 @@ namespace bs
 	 * Importer using for importing a shader written using the BSL syntax. Shader files are plain text files ending with
 	 * ".bsl" extension.
 	 */
-	class BS_SL_EXPORT SLImporter : public SpecificImporter
+	class SLImporter : public SpecificImporter
 	{
 	public:
 		SLImporter();

Source/BansheeSL/Include/BsSLPrerequisites.h

@@ -4,22 +4,6 @@
 
 #include "BsPrerequisites.h"
 
-#if (BS_PLATFORM == BS_PLATFORM_WIN32) && !defined(__MINGW32__)
-#	ifdef BS_SL_EXPORTS
-#		define BS_SL_EXPORT __declspec(dllexport)
-#	else
-#       if defined( __MINGW32__ )
-#           define BS_SL_EXPORT
-#       else
-#    		define BS_SL_EXPORT __declspec(dllimport)
-#       endif
-#	endif
-#elif defined ( BS_GCC_VISIBILITY )
-#    define BS_SL_EXPORT  __attribute__ ((visibility("default")))
-#else
-#    define BS_SL_EXPORTS
-#endif
-
 /** @addtogroup Plugins
  *  @{
  */

Source/BansheeSL/Source/BsSLPlugin.cpp

@@ -9,13 +9,13 @@ namespace bs
 	const char* SystemName = "BansheeSL";
 
 	/**	Returns a name of the plugin. */
-	extern "C" BS_SL_EXPORT const char* getPluginName()
+	extern "C" BS_PLUGIN_EXPORT const char* getPluginName()
 	{
 		return SystemName;
 	}
 
 	/**	Entry point to the plugin. Called by the engine when the plugin is loaded. */
-	extern "C" BS_SL_EXPORT void* loadPlugin()
+	extern "C" BS_PLUGIN_EXPORT void* loadPlugin()
 	{
 		SLImporter* importer = bs_new<SLImporter>();
 		Importer::instance()._registerAssetImporter(importer);

Source/BansheeUtility/Include/BsPlatformDefines.h

@@ -91,6 +91,18 @@
 #  define BS_UTILITY_HIDDEN __attribute__ ((visibility ("hidden")))
 #endif
 
+// DLL export for plugins
+#if BS_PLATFORM == BS_PLATFORM_WIN32 // Windows
+#  if BS_COMPILER == BS_COMPILER_MSVC
+#    define BS_PLUGIN_EXPORT __declspec(dllexport)
+#  else
+#    define BS_PLUGIN_EXPORT __attribute__ ((dllexport))
+#  endif
+#  define BS_UTILITY_HIDDEN
+#else // Linux/Mac settings
+#  define BS_PLUGIN_EXPORT __attribute__ ((visibility ("default")))
+#endif
+
 // Windows Settings
 #if BS_PLATFORM == BS_PLATFORM_WIN32
 // Win32 compilers use _DEBUG for specifying debug builds.

Source/BansheeVulkanRenderAPI/Include/BsVulkanPrerequisites.h

@@ -16,22 +16,6 @@
 /** Maximum number of GPU queues that may exist at once. */
 #define BS_MAX_UNIQUE_QUEUES BS_MAX_QUEUES_PER_TYPE * bs::GQT_COUNT // Must fit within 4 bytes
 
-#if (BS_PLATFORM == BS_PLATFORM_WIN32) && !defined(__MINGW32__) && !defined(BS_STATIC_LIB)
-#	ifdef BS_VULKAN_EXPORTS
-#		define BS_VULKAN_EXPORT __declspec(dllexport)
-#	else
-#       if defined( __MINGW32__ )
-#           define BS_VULKAN_EXPORT
-#       else
-#    		define BS_VULKAN_EXPORT __declspec(dllimport)
-#       endif
-#	endif
-#elif defined (BS_GCC_VISIBILITY)
-#    define BS_VULKAN_EXPORT  __attribute__ ((visibility("default")))
-#else
-#    define BS_VULKAN_EXPORT
-#endif
-
 #include "vulkan/vulkan.h"
 
 /** @addtogroup Plugins

Source/BansheeVulkanRenderAPI/Source/BsVulkanPlugin.cpp

@@ -5,7 +5,7 @@
 
 namespace bs
 {
-	extern "C" BS_VULKAN_EXPORT const char* getPluginName()
+	extern "C" BS_PLUGIN_EXPORT const char* getPluginName()
 	{
 		return ct::SystemName;
 	}

Source/RenderBeast/Include/BsObjectRendering.h

@@ -27,7 +27,7 @@ namespace bs
 	extern PerFrameParamDef gPerFrameParamDef;
 
 	/** Manages initialization and rendering of individual renderable object, represented as RenderableElement%s. */
-	class BS_BSRND_EXPORT ObjectRenderer
+	class ObjectRenderer
 	{
 	public:
 		ObjectRenderer();

Source/RenderBeast/Include/BsPostProcessing.h

@@ -239,7 +239,7 @@ namespace bs { namespace ct
 	 *
 	 * @note	Core thread only.
 	 */
-	class BS_BSRND_EXPORT PostProcessing : public Module<PostProcessing>
+	class PostProcessing : public Module<PostProcessing>
 	{
 	public:
 		/** 

Source/RenderBeast/Include/BsRenderBeastFactory.h

@@ -17,7 +17,7 @@ namespace bs
 	 * Renderer factory implementation that creates and initializes the default Banshee renderer. Used by the 
 	 * RendererManager.
 	 */
-	class BS_BSRND_EXPORT RenderBeastFactory : public RendererFactory
+	class RenderBeastFactory : public RendererFactory
 	{
 	public:
 		/** @copydoc RendererFactory::create */

Source/RenderBeast/Include/BsRenderBeastOptions.h

@@ -21,7 +21,7 @@ namespace bs { namespace ct
 	};
 
 	/** A set of options used for controlling the rendering of the RenderBeast renderer. */
-	struct BS_BSRND_EXPORT RenderBeastOptions : public RendererOptions
+	struct RenderBeastOptions : public RendererOptions
 	{
 		RenderBeastOptions() { }
 

Source/RenderBeast/Include/BsRenderBeastPrerequisites.h

@@ -4,22 +4,6 @@
 
 #include "BsPrerequisites.h"
 
-#if (BS_PLATFORM == BS_PLATFORM_WIN32) && !defined(__MINGW32__)
-#	ifdef BS_BSRND_EXPORTS
-#		define BS_BSRND_EXPORT __declspec(dllexport)
-#	else
-#       if defined( __MINGW32__ )
-#           define BS_BSRND_EXPORT
-#       else
-#    		define BS_BSRND_EXPORT __declspec(dllimport)
-#       endif
-#	endif
-#elif defined ( BS_GCC_VISIBILITY )
-#    define BS_BSRND_EXPORT  __attribute__ ((visibility("default")))
-#else
-#    define BS_BSRND_EXPORT
-#endif
-
 /** @addtogroup Plugins
  *  @{
  */

Source/RenderBeast/Include/BsRenderTargets.h

@@ -17,7 +17,7 @@ namespace bs { namespace ct
 	 *
 	 * @note	Core thread only.
 	 */
-	class BS_BSRND_EXPORT RenderTargets
+	class RenderTargets
 	{
 	public:
 		/**

Source/RenderBeast/Include/BsSamplerOverrides.h

@@ -60,7 +60,7 @@ namespace bs { namespace ct
 	};
 
 	/**	Helper class for generating sampler overrides. */
-	class BS_BSRND_EXPORT SamplerOverrideUtility
+	class SamplerOverrideUtility
 	{
 	public:
 		/**

Source/RenderBeast/Source/BsRenderBeastPlugin.cpp

@@ -7,13 +7,13 @@
 namespace bs
 {
 	/**	Returns a name of the plugin. */
-	extern "C" BS_BSRND_EXPORT const char* getPluginName()
+	extern "C" BS_PLUGIN_EXPORT const char* getPluginName()
 	{
 		return SystemName;
 	}
 
 	/**	Entry point to the plugin. Called by the engine when the plugin is loaded. */
-	extern "C" BS_BSRND_EXPORT void* loadPlugin()
+	extern "C" BS_PLUGIN_EXPORT void* loadPlugin()
 	{
 		RendererManager::instance()._registerFactory(bs_shared_ptr_new<RenderBeastFactory>());