More renames

CamelotRenderer/OgreAlignedAllocator.h

@@ -61,7 +61,7 @@ namespace Ogre {
     @note
         This class intended to use by advanced user only.
     */
-	class _OgreExport AlignedMemory
+	class CM_EXPORT AlignedMemory
 	{
 	public:
         /** Allocate memory with given alignment.

CamelotRenderer/OgreAxisAlignedBox.h

@@ -51,7 +51,7 @@ namespace Ogre {
 	for an axis-aligned bounding box (AABB) for collision and
 	visibility determination.
 	*/
-	class _OgreExport AxisAlignedBox
+	class CM_EXPORT AxisAlignedBox
 	{
 	public:
 		enum Extent
@@ -352,7 +352,7 @@ namespace Ogre {
 			}
 		}
 
-		_OgreExport friend std::ostream& operator<<( std::ostream& o, const AxisAlignedBox aab )
+		CM_EXPORT friend std::ostream& operator<<( std::ostream& o, const AxisAlignedBox aab )
 		{
 			switch (aab.mExtent)
 			{

CamelotRenderer/OgreBlendMode.h

@@ -136,7 +136,7 @@ namespace Ogre {
             you wish to make an object blend with others in the scene, e.g. to make
             transparent objects etc, use the Material::setSceneBlending method.
     */
-    class _OgreExport LayerBlendModeEx
+    class CM_EXPORT LayerBlendModeEx
     {
     public:
         /// The type of blending (colour or alpha)

CamelotRenderer/OgreCamera.h

@@ -80,7 +80,7 @@ namespace Ogre {
             This is useful for implementing more complex Camera / object
             relationships i.e. having a camera attached to a world object.
     */
-    class _OgreExport Camera : public Frustum
+    class CM_EXPORT Camera : public Frustum
     {
     protected:
         /// Camera orientation, quaternion style

CamelotRenderer/OgreColourValue.h

@@ -54,7 +54,7 @@ namespace Ogre {
 		    transparency. In this case, 0.0 is completely transparent and 1.0 is
 		    fully opaque.
     */
-    class _OgreExport ColourValue
+    class CM_EXPORT ColourValue
     {
     public:
         static const ColourValue ZERO;
@@ -318,7 +318,7 @@ namespace Ogre {
 
 		/** Function for writing to a stream.
 		*/
-		inline _OgreExport friend std::ostream& operator <<
+		inline CM_EXPORT friend std::ostream& operator <<
 			( std::ostream& o, const ColourValue& c )
 		{
 			o << "ColourValue(" << c.r << ", " << c.g << ", " << c.b << ", " << c.a << ")";

CamelotRenderer/OgreCommon.h

@@ -51,7 +51,7 @@ namespace Ogre {
 	*/
 
 	/// Fast general hashing algorithm
-	uint32 _OgreExport FastHash (const char * data, int len, uint32 hashSoFar = 0);
+	uint32 CM_EXPORT FastHash (const char * data, int len, uint32 hashSoFar = 0);
 	/// Combine hashes with same style as boost::hash_combine
 	template <typename T>
 	uint32 HashCombine (uint32 hashSoFar, const T& data)
@@ -707,7 +707,7 @@ namespace Ogre {
         Should be pre-populated with, for example '-e' and the default setting. 
         Options which are found will have the value updated.
     */
-    int _OgreExport findCommandLineOpts(int numargs, char** argv, UnaryOptionList& unaryOptList, 
+    int CM_EXPORT findCommandLineOpts(int numargs, char** argv, UnaryOptionList& unaryOptList, 
         BinaryOptionList& binOptList);
 
 	/// Generic result of clipping
@@ -738,7 +738,7 @@ namespace Ogre {
 	typedef vector<RenderWindow*>::type RenderWindowList;
 
 	/// Utility class to generate a sequentially numbered series of names
-	class _OgreExport NameGenerator
+	class CM_EXPORT NameGenerator
 	{
 	protected:
 		String mPrefix;

CamelotRenderer/OgreDefaultHardwareBufferManager.h

@@ -43,7 +43,7 @@ namespace Ogre {
 	*/
 
     /// Specialisation of HardwareVertexBuffer for emulation
-    class _OgreExport DefaultHardwareVertexBuffer : public HardwareVertexBuffer 
+    class CM_EXPORT DefaultHardwareVertexBuffer : public HardwareVertexBuffer 
     {
 	protected:
 		unsigned char* mpData;
@@ -70,7 +70,7 @@ namespace Ogre {
     };
 
 	/// Specialisation of HardwareIndexBuffer for emulation
-    class _OgreExport DefaultHardwareIndexBuffer : public HardwareIndexBuffer
+    class CM_EXPORT DefaultHardwareIndexBuffer : public HardwareIndexBuffer
     {
 	protected:
 		unsigned char* mpData;
@@ -100,7 +100,7 @@ namespace Ogre {
 		rendering system (which is required to create a 'real' hardware
 		buffer manager.
 	*/
-	class _OgreExport DefaultHardwareBufferManagerBase : public HardwareBufferManagerBase
+	class CM_EXPORT DefaultHardwareBufferManagerBase : public HardwareBufferManagerBase
 	{
     public:
         DefaultHardwareBufferManagerBase();
@@ -116,7 +116,7 @@ namespace Ogre {
     };
 
 	/// DefaultHardwareBufferManager as a Singleton
-	class _OgreExport DefaultHardwareBufferManager : public HardwareBufferManager
+	class CM_EXPORT DefaultHardwareBufferManager : public HardwareBufferManager
 	{
 	public:
 		DefaultHardwareBufferManager()

CamelotRenderer/OgreException.h

@@ -89,7 +89,7 @@ namespace Ogre {
             object unless it wishes to unify its error handling using the
             same object.
     */
-	class _OgreExport Exception : public std::exception
+	class CM_EXPORT Exception : public std::exception
     {
     protected:
         long line;
@@ -192,55 +192,55 @@ namespace Ogre {
 	// Specialised exceptions allowing each to be caught specifically
 	// backwards-compatible since exception codes still used
 
-	class _OgreExport UnimplementedException : public Exception 
+	class CM_EXPORT UnimplementedException : public Exception 
 	{
 	public:
 		UnimplementedException(int inNumber, const String& inDescription, const String& inSource, const char* inFile, long inLine)
 			: Exception(inNumber, inDescription, inSource, "UnimplementedException", inFile, inLine) {}
 	};
-	class _OgreExport FileNotFoundException : public Exception
+	class CM_EXPORT FileNotFoundException : public Exception
 	{
 	public:
 		FileNotFoundException(int inNumber, const String& inDescription, const String& inSource, const char* inFile, long inLine)
 			: Exception(inNumber, inDescription, inSource, "FileNotFoundException", inFile, inLine) {}
 	};
-	class _OgreExport IOException : public Exception
+	class CM_EXPORT IOException : public Exception
 	{
 	public:
 		IOException(int inNumber, const String& inDescription, const String& inSource, const char* inFile, long inLine)
 			: Exception(inNumber, inDescription, inSource, "IOException", inFile, inLine) {}
 	};
-	class _OgreExport InvalidStateException : public Exception
+	class CM_EXPORT InvalidStateException : public Exception
 	{
 	public:
 		InvalidStateException(int inNumber, const String& inDescription, const String& inSource, const char* inFile, long inLine)
 			: Exception(inNumber, inDescription, inSource, "InvalidStateException", inFile, inLine) {}
 	};
-	class _OgreExport InvalidParametersException : public Exception
+	class CM_EXPORT InvalidParametersException : public Exception
 	{
 	public:
 		InvalidParametersException(int inNumber, const String& inDescription, const String& inSource, const char* inFile, long inLine)
 			: Exception(inNumber, inDescription, inSource, "InvalidParametersException", inFile, inLine) {}
 	};
-	class _OgreExport ItemIdentityException : public Exception
+	class CM_EXPORT ItemIdentityException : public Exception
 	{
 	public:
 		ItemIdentityException(int inNumber, const String& inDescription, const String& inSource, const char* inFile, long inLine)
 			: Exception(inNumber, inDescription, inSource, "ItemIdentityException", inFile, inLine) {}
 	};
-	class _OgreExport InternalErrorException : public Exception
+	class CM_EXPORT InternalErrorException : public Exception
 	{
 	public:
 		InternalErrorException(int inNumber, const String& inDescription, const String& inSource, const char* inFile, long inLine)
 			: Exception(inNumber, inDescription, inSource, "InternalErrorException", inFile, inLine) {}
 	};
-	class _OgreExport RenderingAPIException : public Exception
+	class CM_EXPORT RenderingAPIException : public Exception
 	{
 	public:
 		RenderingAPIException(int inNumber, const String& inDescription, const String& inSource, const char* inFile, long inLine)
 			: Exception(inNumber, inDescription, inSource, "RenderingAPIException", inFile, inLine) {}
 	};
-	class _OgreExport RuntimeAssertionException : public Exception
+	class CM_EXPORT RuntimeAssertionException : public Exception
 	{
 	public:
 		RuntimeAssertionException(int inNumber, const String& inDescription, const String& inSource, const char* inFile, long inLine)

CamelotRenderer/OgreFrustum.h

@@ -60,7 +60,7 @@ namespace Ogre
         used to represent either a visible area or a projection area. Can be used
         for a number of applications.
     */
-    class _OgreExport Frustum
+    class CM_EXPORT Frustum
     {
     protected:
         /// Orthographic or perspective?

CamelotRenderer/OgreGpuProgram.h

@@ -75,7 +75,7 @@ namespace Ogre {
 		If you wish to use higher level shading languages like HLSL and Cg, you need to 
 		use the HighLevelGpuProgram class instead.
 	*/
-	class _OgreExport GpuProgram
+	class CM_EXPORT GpuProgram
 	{
 	protected:
 		/// The type of the program

CamelotRenderer/OgreGpuProgramManager.h

@@ -42,7 +42,7 @@ namespace Ogre {
 	/** \addtogroup Resources
 	*  @{
 	*/
-	class _OgreExport GpuProgramManager : public Singleton<GpuProgramManager>
+	class CM_EXPORT GpuProgramManager : public Singleton<GpuProgramManager>
 	{
 	public:
 

CamelotRenderer/OgreGpuProgramParams.h

@@ -97,7 +97,7 @@ namespace Ogre {
 	@note Only available for high-level programs but is referenced generically
 	by GpuProgramParameters.
 	*/
-	struct _OgreExport GpuConstantDefinition
+	struct CM_EXPORT GpuConstantDefinition
 	{
 		/// Data type
 		GpuConstantType constType;
@@ -257,7 +257,7 @@ namespace Ogre {
 	typedef GpuConstantDefinitionMap::const_iterator GpuConstantDefinitionIterator;
 
 	/// Struct collecting together the information for named constants.
-	struct _OgreExport GpuNamedConstants
+	struct CM_EXPORT GpuNamedConstants
 	{
 		/// Total size of the float buffer required
 		size_t floatBufferSize;
@@ -307,7 +307,7 @@ namespace Ogre {
 	/** Structure recording the use of a physical buffer by a logical parameter
 	index. Only used for low-level programs.
 	*/
-	struct _OgreExport GpuLogicalIndexUse
+	struct CM_EXPORT GpuLogicalIndexUse
 	{
 		/// Physical buffer index
 		size_t physicalIndex;
@@ -323,7 +323,7 @@ namespace Ogre {
 	};
 	typedef map<size_t, GpuLogicalIndexUse>::type GpuLogicalIndexUseMap;
 	/// Container struct to allow params to safely & update shared list of logical buffer assignments
-	struct _OgreExport GpuLogicalBufferStruct
+	struct CM_EXPORT GpuLogicalBufferStruct
 	{
 		CM_MUTEX(mutex)
 			/// Map from logical index to physical buffer location
@@ -360,7 +360,7 @@ namespace Ogre {
 	@note
 		Shared parameter sets can be named, and looked up using the GpuProgramManager.
 	*/
-	class _OgreExport GpuSharedParameters
+	class CM_EXPORT GpuSharedParameters
 	{
 	protected:
 		GpuNamedConstants mNamedConstants;
@@ -464,7 +464,7 @@ namespace Ogre {
 	/** This class records the usage of a set of shared parameters in a concrete
 		set of GpuProgramParameters.
 	*/
-	class _OgreExport GpuSharedParametersUsage
+	class CM_EXPORT GpuSharedParametersUsage
 	{
 	protected:
 		GpuSharedParametersPtr mSharedParams;
@@ -537,7 +537,7 @@ namespace Ogre {
 	any of this unless you intend to read parameters back from this structure
 	rather than just setting them.
 	*/
-	class _OgreExport GpuProgramParameters
+	class CM_EXPORT GpuProgramParameters
 	{
 	public:
 		/** Defines the types of automatically updated values that may be bound to GpuProgram

CamelotRenderer/OgreHardwareBuffer.h

@@ -70,7 +70,7 @@ namespace Ogre {
 		You should look for the 'useShadowBuffer' parameter on the creation methods used to create
 		the buffer of the type you require (see HardwareBufferManager) to enable this feature.
     */
-	class _OgreExport HardwareBuffer
+	class CM_EXPORT HardwareBuffer
     {
 
 	    public:

CamelotRenderer/OgreHardwareBufferManager.h

@@ -54,7 +54,7 @@ namespace Ogre {
 		and passes it to the HardwareBufferManager superclass as a delegate. 
 		This subclass must also delete the implementation instance it creates.
 	*/
-	class _OgreExport HardwareBufferManagerBase
+	class CM_EXPORT HardwareBufferManagerBase
 	{
     protected:
         /** WARNING: The following two members should place before all other members.
@@ -193,7 +193,7 @@ namespace Ogre {
 	};
 
     /** Singleton wrapper for hardware buffer manager. */
-    class _OgreExport HardwareBufferManager : public HardwareBufferManagerBase, public Singleton<HardwareBufferManager>
+    class CM_EXPORT HardwareBufferManager : public HardwareBufferManagerBase, public Singleton<HardwareBufferManager>
     {
     protected:
 		HardwareBufferManagerBase* mImpl;

CamelotRenderer/OgreHardwareIndexBuffer.h

@@ -42,7 +42,7 @@ namespace Ogre {
 	*  @{
 	*/
 	/** Specialisation of HardwareBuffer for vertex index buffers, still abstract. */
-    class _OgreExport HardwareIndexBuffer : public HardwareBuffer
+    class CM_EXPORT HardwareIndexBuffer : public HardwareBuffer
     {
 	    public:
 		    enum IndexType {

CamelotRenderer/OgreHardwareOcclusionQuery.h

@@ -48,7 +48,7 @@ namespace Ogre {
   * @author Lee Sandberg
   * Updated on 13/8/2005 by Tuan Kuranes email: [email protected]
   */
-	class _OgreExport HardwareOcclusionQuery
+	class CM_EXPORT HardwareOcclusionQuery
 {
 //----------------------------------------------------------------------
 // Public methods

CamelotRenderer/OgreHardwarePixelBuffer.h

@@ -47,7 +47,7 @@ namespace Ogre {
     	or in main memory depending on its usage. One mipmap level of a
     	texture is an example of a HardwarePixelBuffer.
     */
-    class _OgreExport HardwarePixelBuffer : public HardwareBuffer
+    class CM_EXPORT HardwarePixelBuffer : public HardwareBuffer
     {
     protected: 
         // Extents

CamelotRenderer/OgreHardwareVertexBuffer.h

@@ -43,7 +43,7 @@ namespace Ogre {
 	*  @{
 	*/
 	/** Specialisation of HardwareBuffer for a vertex buffer. */
-    class _OgreExport HardwareVertexBuffer : public HardwareBuffer
+    class CM_EXPORT HardwareVertexBuffer : public HardwareBuffer
     {
 	    protected:
 
@@ -123,7 +123,7 @@ namespace Ogre {
         define the semantics (position, normal etc), the VertexElement
         class does.
     */
-	class _OgreExport VertexElement
+	class CM_EXPORT VertexElement
     {
     protected:
         /// The source vertex buffer, as bound to an index using VertexBufferBinding
@@ -293,7 +293,7 @@ namespace Ogre {
 	Like the other classes in this functional area, these declarations should be created and
 	destroyed using the HardwareBufferManager.
     */
-	class _OgreExport VertexDeclaration
+	class CM_EXPORT VertexDeclaration
     {
     public:
 		/// Defines the list of vertex elements that makes up this declaration
@@ -458,7 +458,7 @@ namespace Ogre {
 		Like the other classes in this functional area, these binding maps should be created and
 		destroyed using the HardwareBufferManager.
 	*/
-	class _OgreExport VertexBufferBinding
+	class CM_EXPORT VertexBufferBinding
 	{
 	public:
 		/// Defines the vertex buffer bindings used as source for vertex declarations

CamelotRenderer/OgreHighLevelGpuProgram.h

@@ -60,7 +60,7 @@ namespace Ogre {
         can query on the available custom parameters and get/set them without having to 
         link specifically with it.
     */
-    class _OgreExport HighLevelGpuProgram : public GpuProgram
+    class CM_EXPORT HighLevelGpuProgram : public GpuProgram
     {
     protected:
         /// Whether the high-level program (and it's parameter defs) is loaded

CamelotRenderer/OgreHighLevelGpuProgramManager.h

@@ -42,7 +42,7 @@ namespace Ogre {
 	*  @{
 	*/
 	/** Interface definition for factories of HighLevelGpuProgram. */
-	class _OgreExport HighLevelGpuProgramFactory
+	class CM_EXPORT HighLevelGpuProgramFactory
 	{
 	public:
         HighLevelGpuProgramFactory() {}
@@ -65,7 +65,7 @@ namespace Ogre {
 		factories and as such the engine can be extended to accept virtually any kind of
 		program provided a plugin is written.
 	*/
-	class _OgreExport HighLevelGpuProgramManager : public Singleton<HighLevelGpuProgramManager>
+	class CM_EXPORT HighLevelGpuProgramManager : public Singleton<HighLevelGpuProgramManager>
 	{
 	public:
 		typedef map<String, HighLevelGpuProgramFactory*>::type FactoryMap;

CamelotRenderer/OgreMath.h

@@ -81,7 +81,7 @@ namespace Ogre
 		bool operator >= ( const Radian& r ) const { return mRad >= r.mRad; }
 		bool operator >  ( const Radian& r ) const { return mRad >  r.mRad; }
 
-		inline _OgreExport friend std::ostream& operator <<
+		inline CM_EXPORT friend std::ostream& operator <<
 			( std::ostream& o, const Radian& v )
 		{
 			o << "Radian(" << v.valueRadians() << ")";
@@ -132,7 +132,7 @@ namespace Ogre
 		bool operator >= ( const Degree& d ) const { return mDeg >= d.mDeg; }
 		bool operator >  ( const Degree& d ) const { return mDeg >  d.mDeg; }
 
-		inline _OgreExport friend std::ostream& operator <<
+		inline CM_EXPORT friend std::ostream& operator <<
 			( std::ostream& o, const Degree& v )
 		{
 			o << "Degree(" << v.valueDegrees() << ")";
@@ -187,7 +187,7 @@ namespace Ogre
             <br>This is based on MgcMath.h from
             <a href="http://www.geometrictools.com/">Wild Magic</a>.
     */
-    class _OgreExport Math 
+    class CM_EXPORT Math 
     {
    public:
        /** The angular units used by the API. This functionality is now deprecated in favor

CamelotRenderer/OgreMatrix3.h

@@ -65,7 +65,7 @@ namespace Ogre
         @par
             The coordinate system is assumed to be <b>right-handed</b>.
     */
-    class _OgreExport Matrix3
+    class CM_EXPORT Matrix3
     {
     public:
         /** Default constructor.
@@ -146,14 +146,14 @@ namespace Ogre
         Vector3 operator* (const Vector3& rkVector) const;
 
         // vector * matrix [1x3 * 3x3 = 1x3]
-        _OgreExport friend Vector3 operator* (const Vector3& rkVector,
+        CM_EXPORT friend Vector3 operator* (const Vector3& rkVector,
             const Matrix3& rkMatrix);
 
         // matrix * scalar
         Matrix3 operator* (Real fScalar) const;
 
         // scalar * matrix
-        _OgreExport friend Matrix3 operator* (Real fScalar, const Matrix3& rkMatrix);
+        CM_EXPORT friend Matrix3 operator* (Real fScalar, const Matrix3& rkMatrix);
 
         // utilities
         Matrix3 Transpose () const;
@@ -232,7 +232,7 @@ namespace Ogre
 
 		/** Function for writing to a stream.
 		*/
-		inline _OgreExport friend std::ostream& operator <<
+		inline CM_EXPORT friend std::ostream& operator <<
 			( std::ostream& o, const Matrix3& mat )
 		{
 			o << "Matrix3(" << mat[0][0] << ", " << mat[0][1] << ", " << mat[0][2] << ", " 

CamelotRenderer/OgreMatrix4.h

@@ -75,7 +75,7 @@ namespace Ogre
                 [ m[3][0]  m[3][1]  m[3][2]  m[3][3] ]   {1}
             </pre>
     */
-    class _OgreExport Matrix4
+    class CM_EXPORT Matrix4
     {
     protected:
         /// The matrix entries, indexed by [row][col].
@@ -523,7 +523,7 @@ namespace Ogre
 
         /** Function for writing to a stream.
         */
-        inline _OgreExport friend std::ostream& operator <<
+        inline CM_EXPORT friend std::ostream& operator <<
             ( std::ostream& o, const Matrix4& mat )
         {
             o << "Matrix4(";

CamelotRenderer/OgrePixelFormat.h

@@ -190,7 +190,7 @@ namespace Ogre {
      	Pixels are stored as a succession of "depth" slices, each containing "height" rows of 
      	"width" pixels.
     */
-    class _OgreExport PixelBox: public Box {
+    class CM_EXPORT PixelBox: public Box {
     public:
     	/// Parameter constructor for setting the members manually
     	PixelBox() {}
@@ -298,7 +298,7 @@ namespace Ogre {
     /**
      * Some utility functions for packing and unpacking pixel data
      */
-    class _OgreExport PixelUtil {
+    class CM_EXPORT PixelUtil {
     public:
         /** Returns the size in bytes of an element of the given pixel format.
          @returns

CamelotRenderer/OgrePlane.h

@@ -58,7 +58,7 @@ namespace Ogre {
             respectively), and a constant (D) which is the distance along
             the normal you have to go to move the plane back to the origin.
      */
-    class _OgreExport Plane
+    class CM_EXPORT Plane
     {
     public:
         /** Default constructor - sets everything to 0.
@@ -154,7 +154,7 @@ namespace Ogre {
             return (rhs.d != d || rhs.normal != normal);
         }
 
-        _OgreExport friend std::ostream& operator<< (std::ostream& o, const Plane& p);
+        CM_EXPORT friend std::ostream& operator<< (std::ostream& o, const Plane& p);
     };
 
     typedef vector<Plane>::type PlaneList;

CamelotRenderer/OgrePlatform.h

@@ -131,19 +131,17 @@ namespace Ogre {
 // should get exported. Otherwise, import it.
 #	if defined( CM_STATIC_LIB )
 		// Linux compilers don't have symbol import/export directives.
-#   	define _OgreExport
-#   	define _OgrePrivate
+#   	define CM_EXPORT
 #   else
-#   	if defined( CM_NONCLIENT_BUILD )
-#       	define _OgreExport __declspec( dllexport )
+#   	if defined( CM_DLL )
+#       	define CM_EXPORT __declspec( dllexport )
 #   	else
 #           if defined( __MINGW32__ )
-#               define _OgreExport
+#               define CM_EXPORT
 #           else
-#       	    define _OgreExport __declspec( dllimport )
+#       	    define CM_EXPORT __declspec( dllimport )
 #           endif
 #   	endif
-#   	define _OgrePrivate
 #	endif
 // Win32 compilers use _DEBUG for specifying debug builds.
 // for MinGW, we set DEBUG
@@ -183,8 +181,7 @@ namespace Ogre {
 #if CM_PLATFORM == OGRE_PLATFORM_SYMBIAN
 #	define OGRE_UNICODE_SUPPORT 1
 #   define CM_DEBUG_MODE 0
-#   define _OgreExport
-#   define _OgrePrivate
+#   define CM_EXPORT
 #	define CLOCKS_PER_SEC  1000
 // pragma def were found here: http://www.inf.pucrs.br/~eduardob/disciplinas/SistEmbarcados/Mobile/Nokia/Tools/Carbide_vs/WINSCW/Help/PDF/C_Compilers_Reference_3.2.pdf
 #	pragma warn_unusedarg off
@@ -197,11 +194,9 @@ namespace Ogre {
 
 // Enable GCC symbol visibility
 #   if defined( CM_GCC_VISIBILITY )
-#       define _OgreExport  __attribute__ ((visibility("default")))
-#       define _OgrePrivate __attribute__ ((visibility("hidden")))
+#       define CM_EXPORT  __attribute__ ((visibility("default")))
 #   else
-#       define _OgreExport
-#       define _OgrePrivate
+#       define CM_EXPORT
 #   endif
 
 // A quick define to overcome different names for the same function

CamelotRenderer/OgreQuaternion.h

@@ -49,7 +49,7 @@ namespace Ogre {
 	*/
 	/** Implementation of a Quaternion, i.e. a rotation around an axis.
     */
-    class _OgreExport Quaternion
+    class CM_EXPORT Quaternion
     {
     public:
         inline Quaternion (
@@ -157,7 +157,7 @@ namespace Ogre {
         Quaternion operator- (const Quaternion& rkQ) const;
         Quaternion operator* (const Quaternion& rkQ) const;
         Quaternion operator* (Real fScalar) const;
-        _OgreExport friend Quaternion operator* (Real fScalar,
+        CM_EXPORT friend Quaternion operator* (Real fScalar,
             const Quaternion& rkQ);
         Quaternion operator- () const;
         inline bool operator== (const Quaternion& rhs) const
@@ -252,7 +252,7 @@ namespace Ogre {
         /** Function for writing to a stream. Outputs "Quaternion(w, x, y, z)" with w,x,y,z
             being the member values of the quaternion.
         */
-        inline _OgreExport friend std::ostream& operator <<
+        inline CM_EXPORT friend std::ostream& operator <<
             ( std::ostream& o, const Quaternion& q )
         {
             o << "Quaternion(" << q.w << ", " << q.x << ", " << q.y << ", " << q.z << ")";

CamelotRenderer/OgreRay.h

@@ -42,7 +42,7 @@ namespace Ogre {
 	*  @{
 	*/
 	/** Representation of a ray in space, i.e. a line with an origin and direction. */
-    class _OgreExport Ray
+    class CM_EXPORT Ray
     {
     protected:
         Vector3 mOrigin;

CamelotRenderer/OgreRenderOperation.h

@@ -41,7 +41,7 @@ namespace Ogre {
 	*  @{
 	*/
 	/** 'New' rendering operation using vertex buffers. */
-	class _OgrePrivate RenderOperation {
+	class RenderOperation {
 	public:
 		/// The rendering operation type to perform
 		enum OperationType {

CamelotRenderer/OgreRenderSystem.h

@@ -117,7 +117,7 @@ namespace Ogre
 	@version
 	1.0
 	*/
-	class _OgreExport RenderSystem
+	class CM_EXPORT RenderSystem
 	{
 	public:
 		/** Default Constructor.
@@ -1221,7 +1221,7 @@ namespace Ogre
 		can raise.
 		@see RenderSystem::addListener
 		*/
-		class _OgreExport Listener
+		class CM_EXPORT Listener
 		{
 		public:
 			Listener() {}

CamelotRenderer/OgreRenderSystemCapabilities.h

@@ -168,7 +168,7 @@ namespace Ogre
 
 	/// DriverVersion is used by RenderSystemCapabilities and both GL and D3D9
 	/// to store the version of the current GPU driver
-	struct _OgreExport DriverVersion 
+	struct CM_EXPORT DriverVersion 
 	{
 		int major;
 		int minor;
@@ -228,7 +228,7 @@ namespace Ogre
 	This class stores the capabilities of the graphics card.  This
 	information is set by the individual render systems.
 	*/
-	class _OgreExport RenderSystemCapabilities
+	class CM_EXPORT RenderSystemCapabilities
 	{
 
 	public:

CamelotRenderer/OgreRenderTarget.h

@@ -60,7 +60,7 @@ namespace Ogre {
         @version
             1.0
      */
-    class _OgreExport RenderTarget
+    class CM_EXPORT RenderTarget
     {
     public:
 		enum FrameBuffer

CamelotRenderer/OgreRenderTexture.h

@@ -45,7 +45,7 @@ namespace Ogre
         RenderTargets rendering to different mipmaps, faces (for cubemaps) or slices (for 3D textures)
         of the same Texture.
     */
-    class _OgreExport RenderTexture: public RenderTarget
+    class CM_EXPORT RenderTexture: public RenderTarget
     {
     public:
         RenderTexture(HardwarePixelBuffer *buffer, size_t zoffset);
@@ -66,7 +66,7 @@ namespace Ogre
 		- All bound surfaces have the same bit depth
 		- Target 0 is bound
 	*/
-	class _OgreExport MultiRenderTarget: public RenderTarget
+	class CM_EXPORT MultiRenderTarget: public RenderTarget
 	{
 	public:
 		MultiRenderTarget(const String &name);

CamelotRenderer/OgreRenderWindow.h

@@ -59,7 +59,7 @@ namespace Ogre
         @version
             1.0
     */
-    class _OgreExport RenderWindow : public RenderTarget
+    class CM_EXPORT RenderWindow : public RenderTarget
     {
 
     public:

CamelotRenderer/OgreSphere.h

@@ -48,7 +48,7 @@ namespace Ogre {
         x^2 + y^2 + z^2 = r^2 (for sphere's centered on the origin). Ogre stores spheres
         simply as a center point and a radius.
     */
-    class _OgreExport Sphere
+    class CM_EXPORT Sphere
     {
     protected:
         Real mRadius;

CamelotRenderer/OgreString.h

@@ -71,7 +71,7 @@ namespace Ogre {
 	*/
 
     /** Utility class for manipulating Strings.  */
-    class _OgreExport StringUtil
+    class CM_EXPORT StringUtil
     {
 	public:
 		typedef StringStream StrStreamType;

CamelotRenderer/OgreStringConverter.h

@@ -65,7 +65,7 @@ namespace Ogre {
     @author
         Steve Streeting
     */
-    class _OgreExport StringConverter
+    class CM_EXPORT StringConverter
     {
     public:
 

CamelotRenderer/OgreTexture.h

@@ -94,7 +94,7 @@ namespace Ogre {
             different in reality. Texture objects are created through
             the 'create' method of the TextureManager concrete subclass.
      */
-    class _OgreExport Texture
+    class CM_EXPORT Texture
     {
     public:
         Texture();

CamelotRenderer/OgreTextureManager.h

@@ -56,7 +56,7 @@ namespace Ogre {
             created at least one window - this may be done at the
             same time as part a if you allow Ogre to autocreate one.
      */
-    class _OgreExport TextureManager : public Singleton<TextureManager>
+    class CM_EXPORT TextureManager : public Singleton<TextureManager>
     {
 		protected:
 			virtual Texture* createImpl() = 0;

CamelotRenderer/OgreTextureState.h

@@ -58,7 +58,7 @@ namespace Ogre {
         where you do not use vertex or fragment programs (shaders). Programmable 
         pipeline means that for this pass you are using vertex or fragment programs.
     */
-	class _OgreExport TextureState
+	class CM_EXPORT TextureState
     {
     public:
 

CamelotRenderer/OgreVector2.h

@@ -48,7 +48,7 @@ namespace Ogre
             scaling factors can be represented by a vector, depending on how
             you interpret the values.
     */
-    class _OgreExport Vector2
+    class CM_EXPORT Vector2
     {
     public:
         Real x, y;
@@ -558,7 +558,7 @@ namespace Ogre
 
         /** Function for writing to a stream.
         */
-        inline _OgreExport friend std::ostream& operator <<
+        inline CM_EXPORT friend std::ostream& operator <<
             ( std::ostream& o, const Vector2& v )
         {
             o << "Vector2(" << v.x << ", " << v.y <<  ")";

CamelotRenderer/OgreVector3.h

@@ -48,7 +48,7 @@ namespace Ogre
             scaling factors can be represented by a vector, depending on how
             you interpret the values.
     */
-    class _OgreExport Vector3
+    class CM_EXPORT Vector3
     {
     public:
 		Real x, y, z;
@@ -782,7 +782,7 @@ namespace Ogre
 
         /** Function for writing to a stream.
         */
-        inline _OgreExport friend std::ostream& operator <<
+        inline CM_EXPORT friend std::ostream& operator <<
             ( std::ostream& o, const Vector3& v )
         {
             o << "Vector3(" << v.x << ", " << v.y << ", " << v.z << ")";

CamelotRenderer/OgreVector4.h

@@ -42,7 +42,7 @@ namespace Ogre
 	*/
 	/** 4-dimensional homogeneous vector.
     */
-    class _OgreExport Vector4
+    class CM_EXPORT Vector4
     {
     public:
         Real x, y, z, w;
@@ -397,7 +397,7 @@ namespace Ogre
 		}
         /** Function for writing to a stream.
         */
-        inline _OgreExport friend std::ostream& operator <<
+        inline CM_EXPORT friend std::ostream& operator <<
             ( std::ostream& o, const Vector4& v )
         {
             o << "Vector4(" << v.x << ", " << v.y << ", " << v.z << ", " << v.w << ")";

CamelotRenderer/OgreVertexIndexData.h

@@ -45,7 +45,7 @@ namespace Ogre {
 
 
 	/** Summary class collecting together vertex source information. */
-	class _OgreExport VertexData
+	class CM_EXPORT VertexData
 	{
     private:
         /// Protected copy constructor, to prevent misuse
@@ -204,7 +204,7 @@ namespace Ogre {
 	};
 
 	/** Summary class collecting together index data source information. */
-	class _OgreExport IndexData
+	class CM_EXPORT IndexData
 	{
     protected:
         /// Protected copy constructor, to prevent misuse
@@ -247,7 +247,7 @@ namespace Ogre {
 		Utility class for evaluating the effectiveness of the use of the vertex
 		cache by a given index buffer.
 	*/
-	class _OgreExport VertexCacheProfiler
+	class CM_EXPORT VertexCacheProfiler
     {
 		public:
 			enum CacheType {

CamelotRenderer/OgreViewport.h

@@ -53,7 +53,7 @@ namespace Ogre {
             viewport on a single render target and they overlap, one must
             obscure the other in some predetermined way.
     */
-	class _OgreExport Viewport
+	class CM_EXPORT Viewport
     {
     public:       
         /** The usual constructor.

CamelotRenderer/OgreWindowEventUtilities.h

@@ -55,7 +55,7 @@ namespace Ogre
 	@Remarks
 		Callback class used to send out window events to client app
 	*/
-	class _OgreExport WindowEventListener
+	class CM_EXPORT WindowEventListener
 	{
 	public:
 		virtual ~WindowEventListener() {}
@@ -115,7 +115,7 @@ namespace Ogre
 	@Remarks
 		Utility class to handle Window Events/Pumping/Messages
 	*/
-	class _OgreExport WindowEventUtilities
+	class CM_EXPORT WindowEventUtilities
 	{
 	public:
 		/**

CamelotRenderer/RenderSystemGL/Include/OgreGLRenderTexture.h

@@ -34,7 +34,7 @@ THE SOFTWARE.
 namespace Ogre {
     /** GL surface descriptor. Points to a 2D surface that can be rendered to. 
     */
-    struct _OgrePrivate GLSurfaceDesc
+    struct GLSurfaceDesc
     {
     public:
         GLHardwarePixelBuffer *buffer;

CamelotUtility/Include/CmPlatform.h

@@ -108,19 +108,17 @@ namespace CamelotEngine {
 // should get exported. Otherwise, import it.
 #	if defined( CM_STATIC_LIB )
 		// Linux compilers don't have symbol import/export directives.
-#   	define _OgreExport
-#   	define _OgrePrivate
+#   	define CM_EXPORT
 #   else
-#   	if defined( CM_NONCLIENT_BUILD )
-#       	define _OgreExport __declspec( dllexport )
+#   	if defined( CM_DLL )
+#       	define CM_EXPORT __declspec( dllexport )
 #   	else
 #           if defined( __MINGW32__ )
-#               define _OgreExport
+#               define CM_EXPORT
 #           else
-#       	    define _OgreExport __declspec( dllimport )
+#       	    define CM_EXPORT __declspec( dllimport )
 #           endif
 #   	endif
-#   	define _OgrePrivate
 #	endif
 // Win32 compilers use _DEBUG for specifying debug builds.
 // for MinGW, we set DEBUG
@@ -130,7 +128,7 @@ namespace CamelotEngine {
 #       define CM_DEBUG_MODE 0
 #   endif
 
-#endif // OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#endif // CM_PLATFORM == CM_PLATFORM_WIN32
 
 //----------------------------------------------------------------------------
 // Linux/Apple/Symbian Settings
@@ -138,11 +136,9 @@ namespace CamelotEngine {
 
 // Enable GCC symbol visibility
 #   if defined( CM_GCC_VISIBILITY )
-#       define _OgreExport  __attribute__ ((visibility("default")))
-#       define _OgrePrivate __attribute__ ((visibility("hidden")))
+#       define CM_EXPORT  __attribute__ ((visibility("default")))
 #   else
-#       define _OgreExport
-#       define _OgrePrivate
+#       define CM_EXPORT
 #   endif
 
 // A quick define to overcome different names for the same function
@@ -160,7 +156,7 @@ namespace CamelotEngine {
 
 #if CM_PLATFORM == CM_PLATFORM_APPLE
     #define CM_PLATFORM_LIB "CmPlatform.bundle"
-#else //OGRE_PLATFORM_LINUX
+#else //CM_PLATFORM_LINUX
     #define CM_PLATFORM_LIB "libCmPlatform.so"
 #endif
 

CamelotUtility/Include/OgreAxisAlignedBox.h

@@ -51,7 +51,7 @@ namespace CamelotEngine {
 	for an axis-aligned bounding box (AABB) for collision and
 	visibility determination.
 	*/
-	class _OgreExport AxisAlignedBox
+	class CM_EXPORT AxisAlignedBox
 	{
 	public:
 		enum Extent
@@ -352,7 +352,7 @@ namespace CamelotEngine {
 			}
 		}
 
-		_OgreExport friend std::ostream& operator<<( std::ostream& o, const AxisAlignedBox aab )
+		CM_EXPORT friend std::ostream& operator<<( std::ostream& o, const AxisAlignedBox aab )
 		{
 			switch (aab.mExtent)
 			{

CamelotUtility/Include/OgreMath.h

@@ -81,7 +81,7 @@ namespace CamelotEngine
 		bool operator >= ( const Radian& r ) const { return mRad >= r.mRad; }
 		bool operator >  ( const Radian& r ) const { return mRad >  r.mRad; }
 
-		inline _OgreExport friend std::ostream& operator <<
+		inline CM_EXPORT friend std::ostream& operator <<
 			( std::ostream& o, const Radian& v )
 		{
 			o << "Radian(" << v.valueRadians() << ")";
@@ -132,7 +132,7 @@ namespace CamelotEngine
 		bool operator >= ( const Degree& d ) const { return mDeg >= d.mDeg; }
 		bool operator >  ( const Degree& d ) const { return mDeg >  d.mDeg; }
 
-		inline _OgreExport friend std::ostream& operator <<
+		inline CM_EXPORT friend std::ostream& operator <<
 			( std::ostream& o, const Degree& v )
 		{
 			o << "Degree(" << v.valueDegrees() << ")";
@@ -187,7 +187,7 @@ namespace CamelotEngine
             <br>This is based on MgcMath.h from
             <a href="http://www.geometrictools.com/">Wild Magic</a>.
     */
-    class _OgreExport Math 
+    class CM_EXPORT Math 
     {
    public:
        /** The angular units used by the API. This functionality is now deprecated in favor

CamelotUtility/Include/OgreMatrix3.h

@@ -65,7 +65,7 @@ namespace CamelotEngine
         @par
             The coordinate system is assumed to be <b>right-handed</b>.
     */
-    class _OgreExport Matrix3
+    class CM_EXPORT Matrix3
     {
     public:
         /** Default constructor.
@@ -146,14 +146,14 @@ namespace CamelotEngine
         Vector3 operator* (const Vector3& rkVector) const;
 
         // vector * matrix [1x3 * 3x3 = 1x3]
-        _OgreExport friend Vector3 operator* (const Vector3& rkVector,
+        CM_EXPORT friend Vector3 operator* (const Vector3& rkVector,
             const Matrix3& rkMatrix);
 
         // matrix * scalar
         Matrix3 operator* (float fScalar) const;
 
         // scalar * matrix
-        _OgreExport friend Matrix3 operator* (float fScalar, const Matrix3& rkMatrix);
+        CM_EXPORT friend Matrix3 operator* (float fScalar, const Matrix3& rkMatrix);
 
         // utilities
         Matrix3 Transpose () const;
@@ -232,7 +232,7 @@ namespace CamelotEngine
 
 		/** Function for writing to a stream.
 		*/
-		inline _OgreExport friend std::ostream& operator <<
+		inline CM_EXPORT friend std::ostream& operator <<
 			( std::ostream& o, const Matrix3& mat )
 		{
 			o << "Matrix3(" << mat[0][0] << ", " << mat[0][1] << ", " << mat[0][2] << ", " 

CamelotUtility/Include/OgreMatrix4.h

@@ -75,7 +75,7 @@ namespace CamelotEngine
                 [ m[3][0]  m[3][1]  m[3][2]  m[3][3] ]   {1}
             </pre>
     */
-    class _OgreExport Matrix4
+    class CM_EXPORT Matrix4
     {
     protected:
         /// The matrix entries, indexed by [row][col].
@@ -523,7 +523,7 @@ namespace CamelotEngine
 
         /** Function for writing to a stream.
         */
-        inline _OgreExport friend std::ostream& operator <<
+        inline CM_EXPORT friend std::ostream& operator <<
             ( std::ostream& o, const Matrix4& mat )
         {
             o << "Matrix4(";

CamelotUtility/Include/OgrePlane.h

@@ -58,7 +58,7 @@ namespace CamelotEngine {
             respectively), and a constant (D) which is the distance along
             the normal you have to go to move the plane back to the origin.
      */
-    class _OgreExport Plane
+    class CM_EXPORT Plane
     {
     public:
         /** Default constructor - sets everything to 0.
@@ -154,7 +154,7 @@ namespace CamelotEngine {
             return (rhs.d != d || rhs.normal != normal);
         }
 
-        _OgreExport friend std::ostream& operator<< (std::ostream& o, const Plane& p);
+        CM_EXPORT friend std::ostream& operator<< (std::ostream& o, const Plane& p);
     };
 
     typedef vector<Plane>::type PlaneList;

CamelotUtility/Include/OgreQuaternion.h

@@ -49,7 +49,7 @@ namespace CamelotEngine {
 	*/
 	/** Implementation of a Quaternion, i.e. a rotation around an axis.
     */
-    class _OgreExport Quaternion
+    class CM_EXPORT Quaternion
     {
     public:
         inline Quaternion (
@@ -157,7 +157,7 @@ namespace CamelotEngine {
         Quaternion operator- (const Quaternion& rkQ) const;
         Quaternion operator* (const Quaternion& rkQ) const;
         Quaternion operator* (float fScalar) const;
-        _OgreExport friend Quaternion operator* (float fScalar,
+        CM_EXPORT friend Quaternion operator* (float fScalar,
             const Quaternion& rkQ);
         Quaternion operator- () const;
         inline bool operator== (const Quaternion& rhs) const
@@ -252,7 +252,7 @@ namespace CamelotEngine {
         /** Function for writing to a stream. Outputs "Quaternion(w, x, y, z)" with w,x,y,z
             being the member values of the quaternion.
         */
-        inline _OgreExport friend std::ostream& operator <<
+        inline CM_EXPORT friend std::ostream& operator <<
             ( std::ostream& o, const Quaternion& q )
         {
             o << "Quaternion(" << q.w << ", " << q.x << ", " << q.y << ", " << q.z << ")";

CamelotUtility/Include/OgreRay.h

@@ -42,7 +42,7 @@ namespace CamelotEngine {
 	*  @{
 	*/
 	/** Representation of a ray in space, i.e. a line with an origin and direction. */
-    class _OgreExport Ray
+    class CM_EXPORT Ray
     {
     protected:
         Vector3 mOrigin;

CamelotUtility/Include/OgreSphere.h

@@ -48,7 +48,7 @@ namespace CamelotEngine {
         x^2 + y^2 + z^2 = r^2 (for sphere's centered on the origin). Ogre stores spheres
         simply as a center point and a radius.
     */
-    class _OgreExport Sphere
+    class CM_EXPORT Sphere
     {
     protected:
         float mRadius;

CamelotUtility/Include/OgreVector2.h

@@ -48,7 +48,7 @@ namespace CamelotEngine
             scaling factors can be represented by a vector, depending on how
             you interpret the values.
     */
-    class _OgreExport Vector2
+    class CM_EXPORT Vector2
     {
     public:
         float x, y;
@@ -558,7 +558,7 @@ namespace CamelotEngine
 
         /** Function for writing to a stream.
         */
-        inline _OgreExport friend std::ostream& operator <<
+        inline CM_EXPORT friend std::ostream& operator <<
             ( std::ostream& o, const Vector2& v )
         {
             o << "Vector2(" << v.x << ", " << v.y <<  ")";

CamelotUtility/Include/OgreVector3.h

@@ -48,7 +48,7 @@ namespace CamelotEngine
             scaling factors can be represented by a vector, depending on how
             you interpret the values.
     */
-    class _OgreExport Vector3
+    class CM_EXPORT Vector3
     {
     public:
 		float x, y, z;
@@ -782,7 +782,7 @@ namespace CamelotEngine
 
         /** Function for writing to a stream.
         */
-        inline _OgreExport friend std::ostream& operator <<
+        inline CM_EXPORT friend std::ostream& operator <<
             ( std::ostream& o, const Vector3& v )
         {
             o << "Vector3(" << v.x << ", " << v.y << ", " << v.z << ")";

CamelotUtility/Include/OgreVector4.h

@@ -42,7 +42,7 @@ namespace CamelotEngine
 	*/
 	/** 4-dimensional homogeneous vector.
     */
-    class _OgreExport Vector4
+    class CM_EXPORT Vector4
     {
     public:
         float x, y, z, w;
@@ -397,7 +397,7 @@ namespace CamelotEngine
 		}
         /** Function for writing to a stream.
         */
-        inline _OgreExport friend std::ostream& operator <<
+        inline CM_EXPORT friend std::ostream& operator <<
             ( std::ostream& o, const Vector4& v )
         {
             o << "Vector4(" << v.x << ", " << v.y << ", " << v.z << ", " << v.w << ")";