Renamed a bunch of macros

CamelotRenderer/CamelotRenderer.vcxproj

@@ -55,7 +55,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;OGRE_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;CM_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;RenderSystemGL/Source/nvparse;RenderSystemGL/Source/atifs/include;RenderSystemGL/Source/GLSL/include;RenderSystemGL/Source/win32;RenderSystemGL/Source/nvparse/winheaders;.;RenderSystemGL/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
@@ -72,7 +72,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;OGRE_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;CM_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;RenderSystemGL/Source/nvparse;RenderSystemGL/Source/atifs/include;RenderSystemGL/Source/GLSL/include;RenderSystemGL/Source/win32;RenderSystemGL/Source/nvparse/winheaders;.;RenderSystemGL/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>

CamelotRenderer/CmD3D9RenderSystemFactory.cpp

@@ -4,7 +4,7 @@ namespace CamelotEngine
 {
 	RenderSystemPtr D3D9RenderSystemFactory::create()
 	{
-	#ifdef OGRE_STATIC_LIB
+	#ifdef CM_STATIC_LIB
 		HINSTANCE hInst = GetModuleHandle( NULL );
 	#else
 		HINSTANCE hInst = GetModuleHandle( "CamelotEngine.dll" ); // TODO - Change name if I plan on using external dll

CamelotRenderer/OgreAlignedAllocator.cpp

@@ -65,7 +65,7 @@ namespace Ogre {
     //---------------------------------------------------------------------
     void* AlignedMemory::allocate(size_t size)
     {
-        return allocate(size, OGRE_SIMD_ALIGNMENT);
+        return allocate(size, CM_SIMD_ALIGNMENT);
     }
     //---------------------------------------------------------------------
     void AlignedMemory::deallocate(void* p)

CamelotRenderer/OgreBuildSettings.h

@@ -3,7 +3,7 @@
 
 // CMake auto-generated configuration options
 
-/* #undef OGRE_STATIC_LIB */
+/* #undef CM_STATIC_LIB */
 
 #define OGRE_BUILD_RENDERSYSTEM_D3D9
 /* #undef OGRE_BUILD_RENDERSYSTEM_D3D10 */

CamelotRenderer/OgreCamera.cpp

@@ -34,7 +34,7 @@ THE SOFTWARE.
 #include "OgreException.h"
 #include "OgreRenderSystem.h"
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_IPHONE
+#if CM_PLATFORM == OGRE_PLATFORM_IPHONE
 #include "macUtils.h"
 #endif
 

CamelotRenderer/OgreCommon.h

@@ -31,14 +31,14 @@ THE SOFTWARE.
 
 #include "OgreString.h"
 
-#if defined ( OGRE_GCC_VISIBILITY )
+#if defined ( CM_GCC_VISIBILITY )
 #   pragma GCC visibility push(default)
 #endif
 
 #include <utility>
 #include <sstream>
 
-#if defined ( OGRE_GCC_VISIBILITY )
+#if defined ( CM_GCC_VISIBILITY )
 #   pragma GCC visibility pop
 #endif
 

CamelotRenderer/OgreConfig.h

@@ -79,7 +79,7 @@ THE SOFTWARE.
 
 /** Define this if you want to link OGRE as a static lib (preferably as a project file)
 */
-//#define OGRE_STATIC_LIB
+//#define CM_STATIC_LIB
 
 
 // define the memory allocator configuration to use

CamelotRenderer/OgreD3D9HLSLProgram.cpp

@@ -203,7 +203,7 @@ namespace Ogre {
         else
             compileFlags |= D3DXSHADER_PACKMATRIX_ROWMAJOR;
 
-#if OGRE_DEBUG_MODE
+#if CM_DEBUG_MODE
 		compileFlags |= D3DXSHADER_DEBUG;
 #endif
 		switch (mOptimisationLevel)

CamelotRenderer/OgreD3D9Prerequisites.h

@@ -61,7 +61,7 @@ THE SOFTWARE.
 #define SAFE_RELEASE(p)      { if(p) { (p)->Release(); (p)=NULL; } }
 
 // enable extended d3d debug 
-#if OGRE_DEBUG_MODE
+#if CM_DEBUG_MODE
 #	define D3D_DEBUG_INFO
 #endif
 
@@ -102,7 +102,7 @@ namespace Ogre
     //-------------------------------------------
 	// Windows setttings
 	//-------------------------------------------
-#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_STATIC_LIB)
+#if (CM_PLATFORM == CM_PLATFORM_WIN32) && !defined(CM_STATIC_LIB)
 #	ifdef OGRED3DENGINEDLL_EXPORTS
 #		define _OgreD3D9Export __declspec(dllexport)
 #	else

CamelotRenderer/OgreD3D9RenderSystem.cpp

@@ -2806,7 +2806,7 @@ namespace Ogre
 			ZBufferIdentifier zBufferIdentifier = getZBufferIdentifier(mActiveRenderTarget);
 			ZBufferRefQueue& zBuffers = mZBufferHash[zBufferIdentifier];
 			
-#ifdef OGRE_DEBUG_MODE
+#ifdef CM_DEBUG_MODE
 			//Check that queue handling works as expected
 			IDirect3DSurface9* pDepth;
 			getActiveD3D9Device()->GetDepthStencilSurface(&pDepth);	

CamelotRenderer/OgreException.h

@@ -47,7 +47,7 @@ THE SOFTWARE.
 #       define OgreAssert( a, b ) assert( (a) && (b) )
 
 #   else
-#       if OGRE_COMP != OGRE_COMPILER_BORL
+#       if OGRE_COMP != CM_COMPILER_BORL
 #           define OgreAssert( a, b ) if( !(a) ) OGRE_EXCEPT( Ogre::Exception::ERR_RT_ASSERTION_FAILED, (b), "no function info")
 #       else
 #           define OgreAssert( a, b ) if( !(a) ) OGRE_EXCEPT( Ogre::Exception::ERR_RT_ASSERTION_FAILED, (b), __FUNC__ )
@@ -57,7 +57,7 @@ THE SOFTWARE.
 
 // EXCEPTIONS mode
 #elif OGRE_ASSERT_MODE == 2
-#   if OGRE_COMP != OGRE_COMPILER_BORL
+#   if OGRE_COMP != CM_COMPILER_BORL
 #       define OgreAssert( a, b ) if( !(a) ) OGRE_EXCEPT( Ogre::Exception::ERR_RT_ASSERTION_FAILED, (b), "no function info")
 #   else
 #       define OgreAssert( a, b ) if( !(a) ) OGRE_EXCEPT( Ogre::Exception::ERR_RT_ASSERTION_FAILED, (b), __FUNC__ )

CamelotRenderer/OgreHardwareVertexBuffer.cpp

@@ -196,7 +196,7 @@ namespace Ogre {
 		{
 			// We can't know the specific type right now, so pick a type
 			// based on platform
-#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#if CM_PLATFORM == CM_PLATFORM_WIN32
 			return VET_COLOUR_ARGB; // prefer D3D format on windows
 #else
 			return VET_COLOUR_ABGR; // prefer GL format on everything else
@@ -221,12 +221,12 @@ namespace Ogre {
 	{
 		switch(dst)
 		{
-#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#if CM_PLATFORM == CM_PLATFORM_WIN32
         default:
 #endif
 		case VET_COLOUR_ARGB:
 			return src.getAsARGB();
-#if OGRE_PLATFORM != OGRE_PLATFORM_WIN32
+#if CM_PLATFORM != CM_PLATFORM_WIN32
         default:
 #endif
 		case VET_COLOUR_ABGR: 

CamelotRenderer/OgreHeaderPrefix.h

@@ -28,7 +28,7 @@ THE SOFTWARE
 
 #include "OgrePrerequisites.h"
 
-#if OGRE_COMPILER == OGRE_COMPILER_MSVC
+#if CM_COMPILER == CM_COMPILER_MSVC
 
 // Save warnings state
 #   pragma warning (push)

CamelotRenderer/OgreHeaderSuffix.h

@@ -28,7 +28,7 @@ THE SOFTWARE
 
 #include "OgrePrerequisites.h"
 
-#if OGRE_COMPILER == OGRE_COMPILER_MSVC
+#if CM_COMPILER == CM_COMPILER_MSVC
 
 // restore previous warnings settings
 #   pragma warning (pop)

CamelotRenderer/OgrePlatform.h

@@ -33,45 +33,45 @@ THE SOFTWARE.
 namespace Ogre {
 /* Initial platform/compiler-related stuff to set.
 */
-#define OGRE_PLATFORM_WIN32 1
-#define OGRE_PLATFORM_LINUX 2
-#define OGRE_PLATFORM_APPLE 3
+#define CM_PLATFORM_WIN32 1
+#define CM_PLATFORM_LINUX 2
+#define CM_PLATFORM_APPLE 3
 #define OGRE_PLATFORM_SYMBIAN 4
 #define OGRE_PLATFORM_IPHONE 5
 
-#define OGRE_COMPILER_MSVC 1
-#define OGRE_COMPILER_GNUC 2
-#define OGRE_COMPILER_BORL 3
-#define OGRE_COMPILER_WINSCW 4
-#define OGRE_COMPILER_GCCE 5
+#define CM_COMPILER_MSVC 1
+#define CM_COMPILER_GNUC 2
+#define CM_COMPILER_BORL 3
+#define CM_COMPILER_WINSCW 4
+#define CM_COMPILER_GCCE 5
 
 #define OGRE_ENDIAN_LITTLE 1
 #define OGRE_ENDIAN_BIG 2
 
-#define OGRE_ARCHITECTURE_32 1
-#define OGRE_ARCHITECTURE_64 2
+#define CM_ARCHITECTURE_32 1
+#define CM_ARCHITECTURE_64 2
 
 /* Finds the compiler type and version.
 */
 #if defined( __GCCE__ )
-#   define OGRE_COMPILER OGRE_COMPILER_GCCE
-#   define OGRE_COMP_VER _MSC_VER
+#   define CM_COMPILER CM_COMPILER_GCCE
+#   define CM_COMP_VER _MSC_VER
 //#	include <staticlibinit_gcce.h> // This is a GCCE toolchain workaround needed when compiling with GCCE 
 #elif defined( __WINSCW__ )
-#   define OGRE_COMPILER OGRE_COMPILER_WINSCW
-#   define OGRE_COMP_VER _MSC_VER
+#   define CM_COMPILER CM_COMPILER_WINSCW
+#   define CM_COMP_VER _MSC_VER
 #elif defined( _MSC_VER )
-#   define OGRE_COMPILER OGRE_COMPILER_MSVC
-#   define OGRE_COMP_VER _MSC_VER
+#   define CM_COMPILER CM_COMPILER_MSVC
+#   define CM_COMP_VER _MSC_VER
 #elif defined( __GNUC__ )
-#   define OGRE_COMPILER OGRE_COMPILER_GNUC
-#   define OGRE_COMP_VER (((__GNUC__)*100) + \
+#   define CM_COMPILER CM_COMPILER_GNUC
+#   define CM_COMP_VER (((__GNUC__)*100) + \
         (__GNUC_MINOR__*10) + \
         __GNUC_PATCHLEVEL__)
 
 #elif defined( __BORLANDC__ )
-#   define OGRE_COMPILER OGRE_COMPILER_BORL
-#   define OGRE_COMP_VER __BCPLUSPLUS__
+#   define CM_COMPILER CM_COMPILER_BORL
+#   define CM_COMP_VER __BCPLUSPLUS__
 #   define __FUNCTION__ __FUNC__ 
 #else
 #   pragma error "No known compiler. Abort! Abort!"
@@ -79,8 +79,8 @@ namespace Ogre {
 #endif
 
 /* See if we can use __forceinline or if we need to use __inline instead */
-#if OGRE_COMPILER == OGRE_COMPILER_MSVC
-#   if OGRE_COMP_VER >= 1200
+#if CM_COMPILER == CM_COMPILER_MSVC
+#   if CM_COMP_VER >= 1200
 #       define FORCEINLINE __forceinline
 #   endif
 #elif defined(__MINGW32__)
@@ -94,26 +94,26 @@ namespace Ogre {
 /* Finds the current platform */
 
 #if defined( __SYMBIAN32__ ) 
-#   define OGRE_PLATFORM OGRE_PLATFORM_SYMBIAN
+#   define CM_PLATFORM OGRE_PLATFORM_SYMBIAN
 #elif defined( __WIN32__ ) || defined( _WIN32 )
-#   define OGRE_PLATFORM OGRE_PLATFORM_WIN32
+#   define CM_PLATFORM CM_PLATFORM_WIN32
 #elif defined( __APPLE_CC__)
     // Device                                                     Simulator
     // Both requiring OS version 3.0 or greater
 #   if __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 30000 || __IPHONE_OS_VERSION_MIN_REQUIRED >= 30000
-#       define OGRE_PLATFORM OGRE_PLATFORM_IPHONE
+#       define CM_PLATFORM OGRE_PLATFORM_IPHONE
 #   else
-#       define OGRE_PLATFORM OGRE_PLATFORM_APPLE
+#       define CM_PLATFORM CM_PLATFORM_APPLE
 #   endif
 #else
-#   define OGRE_PLATFORM OGRE_PLATFORM_LINUX
+#   define CM_PLATFORM CM_PLATFORM_LINUX
 #endif
 
     /* Find the arch type */
 #if defined(__x86_64__) || defined(_M_X64) || defined(__powerpc64__) || defined(__alpha__) || defined(__ia64__) || defined(__s390__) || defined(__s390x__)
-#   define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_64
+#   define CM_ARCH_TYPE CM_ARCHITECTURE_64
 #else
-#   define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_32
+#   define CM_ARCH_TYPE CM_ARCHITECTURE_32
 #endif
 
 // For generating compiler warnings - should work on any compiler
@@ -125,16 +125,16 @@ namespace Ogre {
 
 //----------------------------------------------------------------------------
 // Windows Settings
-#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#if CM_PLATFORM == CM_PLATFORM_WIN32
 
 // If we're not including this from a client build, specify that the stuff
 // should get exported. Otherwise, import it.
-#	if defined( OGRE_STATIC_LIB )
+#	if defined( CM_STATIC_LIB )
 		// Linux compilers don't have symbol import/export directives.
 #   	define _OgreExport
 #   	define _OgrePrivate
 #   else
-#   	if defined( OGRE_NONCLIENT_BUILD )
+#   	if defined( CM_NONCLIENT_BUILD )
 #       	define _OgreExport __declspec( dllexport )
 #   	else
 #           if defined( __MINGW32__ )
@@ -148,9 +148,9 @@ namespace Ogre {
 // Win32 compilers use _DEBUG for specifying debug builds.
 // for MinGW, we set DEBUG
 #   if defined(_DEBUG) || defined(DEBUG)
-#       define OGRE_DEBUG_MODE 1
+#       define CM_DEBUG_MODE 1
 #   else
-#       define OGRE_DEBUG_MODE 0
+#       define CM_DEBUG_MODE 0
 #   endif
 
 // Disable unicode support on MingW for GCC 3, poorly supported in stdlibc++
@@ -158,10 +158,10 @@ namespace Ogre {
 // MinGW C++ Toolkit supports unicode and sets the define __MINGW32_TOOLBOX_UNICODE__ in _mingw.h
 // GCC 4 is also fine
 #if defined(__MINGW32__)
-# if OGRE_COMP_VER < 400
+# if CM_COMP_VER < 400
 #  if !defined(_STLPORT_VERSION)
 #   include<_mingw.h>
-#   if defined(__MINGW32_TOOLBOX_UNICODE__) || OGRE_COMP_VER > 345
+#   if defined(__MINGW32_TOOLBOX_UNICODE__) || CM_COMP_VER > 345
 #    define OGRE_UNICODE_SUPPORT 1
 #   else
 #    define OGRE_UNICODE_SUPPORT 0
@@ -180,9 +180,9 @@ namespace Ogre {
 
 //----------------------------------------------------------------------------
 // Symbian Settings
-#if OGRE_PLATFORM == OGRE_PLATFORM_SYMBIAN
+#if CM_PLATFORM == OGRE_PLATFORM_SYMBIAN
 #	define OGRE_UNICODE_SUPPORT 1
-#   define OGRE_DEBUG_MODE 0
+#   define CM_DEBUG_MODE 0
 #   define _OgreExport
 #   define _OgrePrivate
 #	define CLOCKS_PER_SEC  1000
@@ -193,10 +193,10 @@ namespace Ogre {
 #endif
 //----------------------------------------------------------------------------
 // Linux/Apple/Symbian Settings
-#if OGRE_PLATFORM == OGRE_PLATFORM_LINUX || OGRE_PLATFORM == OGRE_PLATFORM_APPLE || OGRE_PLATFORM == OGRE_PLATFORM_IPHONE || OGRE_PLATFORM == OGRE_PLATFORM_SYMBIAN
+#if CM_PLATFORM == CM_PLATFORM_LINUX || CM_PLATFORM == CM_PLATFORM_APPLE || CM_PLATFORM == OGRE_PLATFORM_IPHONE || CM_PLATFORM == OGRE_PLATFORM_SYMBIAN
 
 // Enable GCC symbol visibility
-#   if defined( OGRE_GCC_VISIBILITY )
+#   if defined( CM_GCC_VISIBILITY )
 #       define _OgreExport  __attribute__ ((visibility("default")))
 #       define _OgrePrivate __attribute__ ((visibility("hidden")))
 #   else
@@ -212,17 +212,17 @@ namespace Ogre {
 // (??? this is wrong, on Linux debug builds aren't marked in any way unless
 // you mark it yourself any way you like it -- zap ???)
 #   ifdef DEBUG
-#       define OGRE_DEBUG_MODE 1
+#       define CM_DEBUG_MODE 1
 #   else
-#       define OGRE_DEBUG_MODE 0
+#       define CM_DEBUG_MODE 0
 #   endif
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
-    #define OGRE_PLATFORM_LIB "OgrePlatform.bundle"
-#elif OGRE_PLATFORM == OGRE_PLATFORM_IPHONE
-    #define OGRE_PLATFORM_LIB "OgrePlatform.a"
+#if CM_PLATFORM == CM_PLATFORM_APPLE
+    #define CM_PLATFORM_LIB "OgrePlatform.bundle"
+#elif CM_PLATFORM == OGRE_PLATFORM_IPHONE
+    #define CM_PLATFORM_LIB "OgrePlatform.a"
 #else //OGRE_PLATFORM_LINUX
-    #define OGRE_PLATFORM_LIB "libOgrePlatform.so"
+    #define CM_PLATFORM_LIB "libOgrePlatform.so"
 #endif
 
 // Always enable unicode support for the moment
@@ -250,7 +250,7 @@ typedef int int32;
 typedef short int16;
 typedef char int8;
 // define uint64 type
-#if OGRE_COMPILER == OGRE_COMPILER_MSVC
+#if CM_COMPILER == CM_COMPILER_MSVC
 	typedef unsigned __int64 uint64;
 	typedef __int64 int64;
 #else

CamelotRenderer/OgrePlatformInformation.h

@@ -37,71 +37,71 @@ namespace Ogre {
 
 /* Initial CPU stuff to set.
 */
-#define OGRE_CPU_UNKNOWN    0
-#define OGRE_CPU_X86        1
-#define OGRE_CPU_PPC        2
+#define CM_CPU_UNKNOWN    0
+#define CM_CPU_X86        1
+#define CM_CPU_PPC        2
 #define OGRE_CPU_ARM        3
 
 /* Find CPU type
 */
 #if (defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))) || \
     (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)))
-#   define OGRE_CPU OGRE_CPU_X86
-
-#elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE && defined(__BIG_ENDIAN__)
-#   define OGRE_CPU OGRE_CPU_PPC
-#elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE
-#	define OGRE_CPU OGRE_CPU_X86
-#elif OGRE_PLATFORM == OGRE_PLATFORM_IPHONE && (defined(__i386__) || defined(__x86_64__))
-#	define OGRE_CPU OGRE_CPU_X86
+#   define CM_CPU CM_CPU_X86
+
+#elif CM_PLATFORM == CM_PLATFORM_APPLE && defined(__BIG_ENDIAN__)
+#   define CM_CPU CM_CPU_PPC
+#elif CM_PLATFORM == CM_PLATFORM_APPLE
+#	define CM_CPU CM_CPU_X86
+#elif CM_PLATFORM == OGRE_PLATFORM_IPHONE && (defined(__i386__) || defined(__x86_64__))
+#	define CM_CPU CM_CPU_X86
 #elif defined(__arm__)
-#	define OGRE_CPU OGRE_CPU_ARM
+#	define CM_CPU OGRE_CPU_ARM
 #else
-#   define OGRE_CPU OGRE_CPU_UNKNOWN
+#   define CM_CPU CM_CPU_UNKNOWN
 #endif
 
 /* Find how to declare aligned variable.
 */
-#if OGRE_COMPILER == OGRE_COMPILER_MSVC
-#   define OGRE_ALIGNED_DECL(type, var, alignment)  __declspec(align(alignment)) type var
+#if CM_COMPILER == CM_COMPILER_MSVC
+#   define CM_ALIGNED_DECL(type, var, alignment)  __declspec(align(alignment)) type var
 
-#elif OGRE_COMPILER == OGRE_COMPILER_GNUC
-#   define OGRE_ALIGNED_DECL(type, var, alignment)  type var __attribute__((__aligned__(alignment)))
+#elif CM_COMPILER == CM_COMPILER_GNUC
+#   define CM_ALIGNED_DECL(type, var, alignment)  type var __attribute__((__aligned__(alignment)))
 
 #else
-#   define OGRE_ALIGNED_DECL(type, var, alignment)  type var
+#   define CM_ALIGNED_DECL(type, var, alignment)  type var
 #endif
 
 /** Find perfect alignment (should supports SIMD alignment if SIMD available)
 */
-#if OGRE_CPU == OGRE_CPU_X86
-#   define OGRE_SIMD_ALIGNMENT  16
+#if CM_CPU == CM_CPU_X86
+#   define CM_SIMD_ALIGNMENT  16
 
 #else
-#   define OGRE_SIMD_ALIGNMENT  16
+#   define CM_SIMD_ALIGNMENT  16
 #endif
 
 /* Declare variable aligned to SIMD alignment.
 */
-#define OGRE_SIMD_ALIGNED_DECL(type, var)   OGRE_ALIGNED_DECL(type, var, OGRE_SIMD_ALIGNMENT)
+#define CM_SIMD_ALIGNED_DECL(type, var)   CM_ALIGNED_DECL(type, var, CM_SIMD_ALIGNMENT)
 
 /* Define whether or not Ogre compiled with SSE supports.
 */
-#if OGRE_DOUBLE_PRECISION == 0 && OGRE_CPU == OGRE_CPU_X86 && OGRE_COMPILER == OGRE_COMPILER_MSVC
+#if OGRE_DOUBLE_PRECISION == 0 && CM_CPU == CM_CPU_X86 && CM_COMPILER == CM_COMPILER_MSVC
 #   define __OGRE_HAVE_SSE  1
-#elif OGRE_DOUBLE_PRECISION == 0 && OGRE_CPU == OGRE_CPU_X86 && OGRE_COMPILER == OGRE_COMPILER_GNUC && OGRE_PLATFORM != OGRE_PLATFORM_APPLE_IOS
+#elif OGRE_DOUBLE_PRECISION == 0 && CM_CPU == CM_CPU_X86 && CM_COMPILER == CM_COMPILER_GNUC && CM_PLATFORM != OGRE_PLATFORM_APPLE_IOS
 #   define __OGRE_HAVE_SSE  1
 #endif
 
 /* Define whether or not Ogre compiled with VFP supports.
  */
-#if OGRE_DOUBLE_PRECISION == 0 && OGRE_CPU == OGRE_CPU_ARM && OGRE_COMPILER == OGRE_COMPILER_GNUC && defined(__ARM_ARCH_6K__) && defined(__VFP_FP__)
+#if OGRE_DOUBLE_PRECISION == 0 && CM_CPU == OGRE_CPU_ARM && CM_COMPILER == CM_COMPILER_GNUC && defined(__ARM_ARCH_6K__) && defined(__VFP_FP__)
 #   define __OGRE_HAVE_VFP  1
 #endif
 
 /* Define whether or not Ogre compiled with NEON supports.
  */
-#if OGRE_DOUBLE_PRECISION == 0 && OGRE_CPU == OGRE_CPU_ARM && OGRE_COMPILER == OGRE_COMPILER_GNUC && defined(__ARM_ARCH_7A__) && defined(__ARM_NEON__)
+#if OGRE_DOUBLE_PRECISION == 0 && CM_CPU == OGRE_CPU_ARM && CM_COMPILER == CM_COMPILER_GNUC && defined(__ARM_ARCH_7A__) && defined(__ARM_NEON__)
 #   define __OGRE_HAVE_NEON  1
 #endif
 

CamelotRenderer/OgrePortMemory.h

@@ -32,7 +32,7 @@ namespace Ogre
 
 #define OGRE_MALLOC_SIMD(bytes, category) ::Ogre::AlignedMemory::allocate(bytes)
 #define OGRE_MALLOC_ALIGN(bytes, category, align) ::Ogre::AlignedMemory::allocate(bytes, align)
-#define OGRE_ALLOC_T_SIMD(T, count, category) static_cast<T*>(::Ogre::AlignedMemory::allocate(sizeof(T)*(count),OGRE_SIMD_ALIGNMENT))
+#define OGRE_ALLOC_T_SIMD(T, count, category) static_cast<T*>(::Ogre::AlignedMemory::allocate(sizeof(T)*(count),CM_SIMD_ALIGNMENT))
 #define OGRE_ALLOC_T_ALIGN(T, count, category, align) static_cast<T*>(::Ogre::AlignedMemory::allocate(sizeof(T)*(count), align))
 #define OGRE_FREE_SIMD(ptr, category) ::Ogre::AlignedMemory::deallocate(ptr)
 #define OGRE_FREE_ALIGN(ptr, category, align) ::Ogre::AlignedMemory::deallocate(ptr)

CamelotRenderer/OgrePrerequisites.h

@@ -38,7 +38,7 @@ THE SOFTWARE
 
 
 // configure memory tracking
-#if OGRE_DEBUG_MODE 
+#if CM_DEBUG_MODE 
 #	if OGRE_MEMORY_TRACKER_DEBUG_MODE
 #		define OGRE_MEMORY_TRACKER 1
 #	else
@@ -79,8 +79,8 @@ namespace Ogre {
         typedef float Real;
     #endif
 
-    #if OGRE_COMPILER == OGRE_COMPILER_GNUC && OGRE_COMP_VER >= 310 && !defined(STLPORT)
-	#   if OGRE_COMP_VER >= 430
+    #if CM_COMPILER == CM_COMPILER_GNUC && CM_COMP_VER >= 310 && !defined(STLPORT)
+	#   if CM_COMP_VER >= 430
 	#       define HashMap ::std::tr1::unordered_map
 	#		define HashSet ::std::tr1::unordered_set
 	#    else
@@ -88,11 +88,11 @@ namespace Ogre {
 	#       define HashSet ::__gnu_cxx::hash_set
 	#    endif
     #else
-    #   if OGRE_COMPILER == OGRE_COMPILER_MSVC
-    #       if OGRE_COMP_VER >= 1600 // VC++ 10.0
+    #   if CM_COMPILER == CM_COMPILER_MSVC
+    #       if CM_COMP_VER >= 1600 // VC++ 10.0
 	#			define HashMap ::std::tr1::unordered_map
 	#           define HashSet ::std::tr1::unordered_set
-	#		elif OGRE_COMP_VER > 1300 && !defined(_STLP_MSVC)
+	#		elif CM_COMP_VER > 1300 && !defined(_STLP_MSVC)
     #           define HashMap ::stdext::hash_map
 	#           define HashSet ::stdext::hash_set
     #       else

CamelotRenderer/OgreSingleton.h

@@ -41,13 +41,13 @@ THE SOFTWARE.
 #include "OgrePrerequisites.h"
 #include "OgreHeaderPrefix.h"
 
-#if OGRE_COMPILER == OGRE_COMPILER_MSVC
+#if CM_COMPILER == CM_COMPILER_MSVC
 // Turn off warnings generated by this singleton implementation
 #   pragma warning (disable : 4311)
 #   pragma warning (disable : 4312)
 #endif
 
-#if defined ( OGRE_GCC_VISIBILITY )
+#if defined ( CM_GCC_VISIBILITY )
 #   pragma GCC visibility push(default)
 #endif
 namespace Ogre {
@@ -96,7 +96,7 @@ namespace Ogre {
 	/** @} */
 
 }
-#if defined ( OGRE_GCC_VISIBILITY )
+#if defined ( CM_GCC_VISIBILITY )
 #   pragma GCC visibility pop
 #endif
 

CamelotRenderer/OgreStdHeaders.h

@@ -5,7 +5,7 @@
     #define __STD_ALGORITHM
 #endif
 
-#if defined ( OGRE_GCC_VISIBILITY ) && (OGRE_PLATFORM != OGRE_PLATFORM_APPLE && OGRE_PLATFORM != OGRE_PLATFORM_IPHONE)
+#if defined ( CM_GCC_VISIBILITY ) && (CM_PLATFORM != CM_PLATFORM_APPLE && CM_PLATFORM != OGRE_PLATFORM_IPHONE)
 /* Until libstdc++ for gcc 4.2 is released, we have to declare all
  * symbols in libstdc++.so externally visible, otherwise we end up
  * with them marked as hidden by -fvisible=hidden.
@@ -41,8 +41,8 @@
 
 // Note - not in the original STL, but exists in SGI STL and STLport
 // For gcc 4.3 see http://gcc.gnu.org/gcc-4.3/changes.html
-#if (OGRE_COMPILER == OGRE_COMPILER_GNUC) && !defined(STLPORT)
-#   if OGRE_COMP_VER >= 430
+#if (CM_COMPILER == CM_COMPILER_GNUC) && !defined(STLPORT)
+#   if CM_COMP_VER >= 430
 #       include <tr1/unordered_map>
 #       include <tr1/unordered_set> 
 #   else
@@ -50,7 +50,7 @@
 #       include <ext/hash_set>
 #   endif
 #else
-#   if (OGRE_COMPILER == OGRE_COMPILER_MSVC) && !defined(STLPORT) && OGRE_COMP_VER >= 1600 // VC++ 10.0
+#   if (CM_COMPILER == CM_COMPILER_MSVC) && !defined(STLPORT) && CM_COMP_VER >= 1600 // VC++ 10.0
 #    	include <unordered_map>
 #    	include <unordered_set>
 #	else
@@ -84,7 +84,7 @@ extern "C" {
 
 }
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#if CM_PLATFORM == CM_PLATFORM_WIN32
 #  undef min
 #  undef max
 #	if !defined(NOMINMAX) && defined(_MSC_VER)
@@ -95,7 +95,7 @@ extern "C" {
 #  endif
 #endif
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_LINUX
+#if CM_PLATFORM == CM_PLATFORM_LINUX
 extern "C" {
 
 #   include <unistd.h>
@@ -104,7 +104,7 @@ extern "C" {
 }
 #endif
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE || OGRE_PLATFORM == OGRE_PLATFORM_IPHONE
+#if CM_PLATFORM == CM_PLATFORM_APPLE || CM_PLATFORM == OGRE_PLATFORM_IPHONE
 extern "C" {
 #   include <unistd.h>
 #   include <sys/param.h>
@@ -116,7 +116,7 @@ extern "C" {
 #   include "Threading/OgreThreadHeaders.h"
 #endif
 
-#if defined ( OGRE_GCC_VISIBILITY ) && (OGRE_PLATFORM != OGRE_PLATFORM_APPLE && OGRE_PLATFORM != OGRE_PLATFORM_IPHONE)
+#if defined ( CM_GCC_VISIBILITY ) && (CM_PLATFORM != CM_PLATFORM_APPLE && CM_PLATFORM != OGRE_PLATFORM_IPHONE)
 #   pragma GCC visibility pop
 #endif
 #endif

CamelotRenderer/OgreString.h

@@ -31,10 +31,10 @@ THE SOFTWARE.
 #include "OgrePrerequisites.h"
 
 // If we're using the GCC 3.1 C++ Std lib
-#if OGRE_COMPILER == OGRE_COMPILER_GNUC && OGRE_COMP_VER >= 310 && !defined(STLPORT)
+#if CM_COMPILER == CM_COMPILER_GNUC && CM_COMP_VER >= 310 && !defined(STLPORT)
 
 // For gcc 4.3 see http://gcc.gnu.org/gcc-4.3/changes.html
-#   if OGRE_COMP_VER >= 430
+#   if CM_COMP_VER >= 430
 #       include <tr1/unordered_map> 
 #   else
 #       include <ext/hash_map>
@@ -181,13 +181,13 @@ namespace Ogre {
     };
 
 
-#if OGRE_COMPILER == OGRE_COMPILER_GNUC && OGRE_COMP_VER >= 310 && !defined(STLPORT)
-#   if OGRE_COMP_VER < 430
+#if CM_COMPILER == CM_COMPILER_GNUC && CM_COMP_VER >= 310 && !defined(STLPORT)
+#   if CM_COMP_VER < 430
 	typedef ::__gnu_cxx::hash< _StringBase > _StringHash;
 #   else
 	typedef ::std::tr1::hash< _StringBase > _StringHash;
 #   endif
-#elif OGRE_COMPILER == OGRE_COMPILER_MSVC && OGRE_COMP_VER >= 1600 && !defined(STLPORT) // VC++ 10.0
+#elif CM_COMPILER == CM_COMPILER_MSVC && CM_COMP_VER >= 1600 && !defined(STLPORT) // VC++ 10.0
 	typedef ::std::tr1::hash< _StringBase > _StringHash;
 #elif !defined( _STLP_HASH_FUN_H )
 	typedef stdext::hash_compare< _StringBase, std::less< _StringBase > > _StringHash;

CamelotRenderer/OgreStringConverter.cpp

@@ -55,7 +55,7 @@ namespace Ogre {
         return stream.str();
     }
     //-----------------------------------------------------------------------
-#if OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_64 || OGRE_PLATFORM == OGRE_PLATFORM_APPLE || OGRE_PLATFORM == OGRE_PLATFORM_IPHONE
+#if CM_ARCH_TYPE == CM_ARCHITECTURE_64 || CM_PLATFORM == CM_PLATFORM_APPLE || CM_PLATFORM == OGRE_PLATFORM_IPHONE
     String StringConverter::toString(unsigned int val, 
         unsigned short width, char fill, std::ios::fmtflags flags)
     {
@@ -79,7 +79,7 @@ namespace Ogre {
         stream << val;
         return stream.str();
     }
-#if OGRE_COMPILER == OGRE_COMPILER_MSVC
+#if CM_COMPILER == CM_COMPILER_MSVC
     //-----------------------------------------------------------------------
     String StringConverter::toString(unsigned long val, 
         unsigned short width, char fill, std::ios::fmtflags flags)

CamelotRenderer/OgreStringConverter.h

@@ -91,7 +91,7 @@ namespace Ogre {
         static String toString(int val, unsigned short width = 0, 
             char fill = ' ', 
             std::ios::fmtflags flags = std::ios::fmtflags(0) );
-#if OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_64 || OGRE_PLATFORM == OGRE_PLATFORM_APPLE || OGRE_PLATFORM == OGRE_PLATFORM_IPHONE
+#if CM_ARCH_TYPE == CM_ARCHITECTURE_64 || CM_PLATFORM == CM_PLATFORM_APPLE || CM_PLATFORM == OGRE_PLATFORM_IPHONE
         /** Converts an unsigned int to a String. */
         static String toString(unsigned int val, 
             unsigned short width = 0, char fill = ' ', 
@@ -100,7 +100,7 @@ namespace Ogre {
         static String toString(size_t val, 
             unsigned short width = 0, char fill = ' ', 
             std::ios::fmtflags flags = std::ios::fmtflags(0) );
-        #if OGRE_COMPILER == OGRE_COMPILER_MSVC
+        #if CM_COMPILER == CM_COMPILER_MSVC
                 /** Converts an unsigned long to a String. */
                 static String toString(unsigned long val, 
                     unsigned short width = 0, char fill = ' ', 

CamelotRenderer/OgreWindowEventUtilities.cpp

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #include "OgreRenderWindow.h"
 #include "OgreException.h"
 #include "OgreStringConverter.h"
-#if OGRE_PLATFORM == OGRE_PLATFORM_LINUX
+#if CM_PLATFORM == CM_PLATFORM_LINUX
 #include <X11/Xlib.h>
 void GLXProc( Ogre::RenderWindow *win, const XEvent &event );
 #endif
@@ -42,7 +42,7 @@ WindowEventUtilities::Windows WindowEventUtilities::_msWindows;
 //--------------------------------------------------------------------------------//
 void WindowEventUtilities::messagePump()
 {
-#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#if CM_PLATFORM == CM_PLATFORM_WIN32
 	// Windows Message Loop (NULL means check all HWNDs belonging to this context)
 	MSG  msg;
 	while( PeekMessage( &msg, NULL, 0U, 0U, PM_REMOVE ) )
@@ -50,7 +50,7 @@ void WindowEventUtilities::messagePump()
 		TranslateMessage( &msg );
 		DispatchMessage( &msg );
 	}
-#elif OGRE_PLATFORM == OGRE_PLATFORM_LINUX
+#elif CM_PLATFORM == CM_PLATFORM_LINUX
 	//GLX Message Pump
 	Windows::iterator win = _msWindows.begin();
 	Windows::iterator end = _msWindows.end();
@@ -78,7 +78,7 @@ void WindowEventUtilities::messagePump()
 		GLXProc(*win, event);
 	    }
 	}
-#elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE && !defined __OBJC__ && !defined __LP64__
+#elif CM_PLATFORM == CM_PLATFORM_APPLE && !defined __OBJC__ && !defined __LP64__
 	// OSX Message Pump
 	EventRef event = NULL;
 	EventTargetRef targetWindow;
@@ -132,7 +132,7 @@ void WindowEventUtilities::_removeRenderWindow(RenderWindow* window)
 		_msWindows.erase( i );
 }
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#if CM_PLATFORM == CM_PLATFORM_WIN32
 //--------------------------------------------------------------------------------//
 LRESULT CALLBACK WindowEventUtilities::_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
@@ -249,7 +249,7 @@ LRESULT CALLBACK WindowEventUtilities::_WndProc(HWND hWnd, UINT uMsg, WPARAM wPa
 
 	return DefWindowProc( hWnd, uMsg, wParam, lParam );
 }
-#elif OGRE_PLATFORM == OGRE_PLATFORM_LINUX
+#elif CM_PLATFORM == CM_PLATFORM_LINUX
 //--------------------------------------------------------------------------------//
 void GLXProc( RenderWindow *win, const XEvent &event )
 {
@@ -357,7 +357,7 @@ void GLXProc( RenderWindow *win, const XEvent &event )
 		break;
 	} //End switch event.type
 }
-#elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE && !defined __OBJC__ && !defined __LP64__
+#elif CM_PLATFORM == CM_PLATFORM_APPLE && !defined __OBJC__ && !defined __LP64__
 //--------------------------------------------------------------------------------//
 OSStatus WindowEventUtilities::_CarbonWindowHandler(EventHandlerCallRef nextHandler, EventRef event, void* wnd)
 {

CamelotRenderer/OgreWindowEventUtilities.h

@@ -31,13 +31,13 @@ THE SOFTWARE.
 #include "OgrePrerequisites.h"
 #include "OgrePlatform.h"
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#if CM_PLATFORM == CM_PLATFORM_WIN32
 #  define WIN32_LEAN_AND_MEAN
 #  if !defined(NOMINMAX) && defined(_MSC_VER)
 #	define NOMINMAX // required to stop windows.h messing up std::min
 #  endif
 #  include <windows.h>
-#elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE && !defined(__LP64__)
+#elif CM_PLATFORM == CM_PLATFORM_APPLE && !defined(__LP64__)
 #  include <Carbon/Carbon.h>
 #endif
 
@@ -165,10 +165,10 @@ namespace Ogre
 		*/
 		static void _removeRenderWindow(RenderWindow* window);
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#if CM_PLATFORM == CM_PLATFORM_WIN32
 		//! Internal winProc (RenderWindow's use this when creating the Win32 Window)
 		static LRESULT CALLBACK _WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-#elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE && !defined __OBJC__ && !defined(__LP64__)
+#elif CM_PLATFORM == CM_PLATFORM_APPLE && !defined __OBJC__ && !defined(__LP64__)
         //! Internal UPP Window Handler (RenderWindow's use this when creating the OS X Carbon Window
         static OSStatus _CarbonWindowHandler(EventHandlerCallRef nextHandler, EventRef event, void* wnd);
 #endif

CamelotRenderer/RenderSystemGL/Include/OgreGLPrerequisites.h

@@ -48,7 +48,7 @@ namespace Ogre {
 #	define GLEW_MX
 #endif
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#if CM_PLATFORM == CM_PLATFORM_WIN32
 #if !defined( __MINGW32__ )
 #   define WIN32_LEAN_AND_MEAN
 #  ifndef NOMINMAX
@@ -60,14 +60,14 @@ namespace Ogre {
 #   include <GL/glew.h>
 #   include <GL/wglew.h>
 #   include <GL/glu.h>
-#elif OGRE_PLATFORM == OGRE_PLATFORM_LINUX
+#elif CM_PLATFORM == CM_PLATFORM_LINUX
 #   include <GL/glew.h>
 #   include <GL/glu.h>
 #   define GL_GLEXT_PROTOTYPES
-#elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+#elif CM_PLATFORM == CM_PLATFORM_APPLE
 #   include <GL/glew.h>
 #   include <OpenGL/glu.h>
-#elif OGRE_PLATFORM == OGRE_PLATFORM_IPHONE
+#elif CM_PLATFORM == OGRE_PLATFORM_IPHONE
 #   include <OpenGLES/ES1/gl.h>
 #   include <OpenGLES/ES1/glext.h>
 #endif
@@ -76,7 +76,7 @@ namespace Ogre {
 	// implemented in OgreGLContext.cpp
 	GLEWContext * glewGetContext();
 
-#	if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#	if CM_PLATFORM == CM_PLATFORM_WIN32
 	// implemented in OgreWin32Context.cpp
 	WGLEWContext * wglewGetContext();
 #	endif
@@ -88,7 +88,7 @@ namespace Ogre {
 #define _CRT_SECURE_NO_DEPRECATE
 #endif
 
-#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(__MINGW32__) && !defined(OGRE_STATIC_LIB)
+#if (CM_PLATFORM == CM_PLATFORM_WIN32) && !defined(__MINGW32__) && !defined(CM_STATIC_LIB)
 #	ifdef OGRE_GLPLUGIN_EXPORTS
 #		define _OgreGLExport __declspec(dllexport)
 #	else
@@ -98,7 +98,7 @@ namespace Ogre {
 #    		define _OgreGLExport __declspec(dllimport)
 #       endif
 #	endif
-#elif defined ( OGRE_GCC_VISIBILITY )
+#elif defined ( CM_GCC_VISIBILITY )
 #    define _OgreGLExport  __attribute__ ((visibility("default")))
 #else
 #    define _OgreGLExport

CamelotRenderer/RenderSystemGL/Source/GLSL/src/OgreGLSLLinkProgram.cpp

@@ -424,7 +424,7 @@ namespace Ogre {
                         break;
 
 					} // end switch
-	#if OGRE_DEBUG_MODE
+	#if CM_DEBUG_MODE
 					checkForGLSLError( "GLSLLinkProgram::updateUniforms", "Error updating uniform", 0 );
 	#endif
 				} // variability & mask

CamelotRenderer/RenderSystemGL/Source/GLSL/src/OgreGLSLPreprocessor.cpp

@@ -37,7 +37,7 @@ namespace Ogre {
 // Limit max number of macro arguments to this
 #define MAX_MACRO_ARGS 16
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 && !defined( __MINGW32__ )
+#if CM_PLATFORM == CM_PLATFORM_WIN32 && !defined( __MINGW32__ )
 	#define snprintf _snprintf
 #endif
 

CamelotRenderer/RenderSystemGL/Source/OgreGLHardwareBufferManager.cpp

@@ -59,13 +59,13 @@ namespace Ogre {
 
 		// non-Win32 machines are having issues glBufferSubData, looks like buffer corruption
 		// disable for now until we figure out where the problem lies			
-#	if OGRE_PLATFORM != OGRE_PLATFORM_WIN32
+#	if CM_PLATFORM != CM_PLATFORM_WIN32
 		mMapBufferThreshold = 0;
 #	endif
 
 		// Win32 machines with ATI GPU are having issues glMapBuffer, looks like buffer corruption
 		// disable for now until we figure out where the problem lies			
-#	if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#	if CM_PLATFORM == CM_PLATFORM_WIN32
 		if (CamelotEngine::RenderSystemManager::getActive()->getCapabilities()->getVendor() == GPU_ATI) 
 		{
 			mMapBufferThreshold = 0xffffffffUL  /* maximum unsigned long value */;

CamelotRenderer/RenderSystemGL/Source/OgreGLRenderSystem.cpp

@@ -217,7 +217,7 @@ namespace Ogre {
         if(GLEW_VERSION_1_4 || GLEW_SGIS_generate_mipmap)
         {
 			bool disableAutoMip = false;
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE || OGRE_PLATFORM == OGRE_PLATFORM_LINUX
+#if CM_PLATFORM == CM_PLATFORM_APPLE || CM_PLATFORM == CM_PLATFORM_LINUX
 			// Apple & Linux ATI drivers have faults in hardware mipmap generation
 			if (rsc->getVendor() == GPU_ATI)
 				disableAutoMip = true;

CamelotRenderer/RenderSystemGL/Source/OgreGLTexture.cpp

@@ -41,7 +41,7 @@ THE SOFTWARE.
 
 #include "OgreGLFBORenderTexture.h"
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#if CM_PLATFORM == CM_PLATFORM_WIN32
 #  define WIN32_LEAN_AND_MEAN
 #  if !defined(NOMINMAX) && defined(_MSC_VER)
 #	define NOMINMAX // required to stop windows.h messing up std::min
@@ -135,7 +135,7 @@ namespace Ogre {
 		// However DON'T do this on Apple, their drivers aren't subject to this
 		// problem yet and in fact software generation appears to cause a crash 
 		// in some cases which I've yet to track down
-#if OGRE_PLATFORM != OGRE_PLATFORM_APPLE
+#if CM_PLATFORM != CM_PLATFORM_APPLE
 		if (CamelotEngine::RenderSystemManager::getActive()->getCapabilities()->getVendor() == GPU_NVIDIA
 			&& !PixelUtil::isCompressed(mFormat))
 		{

CamelotRenderer/RenderSystemGL/Source/OgreWin32GLSupport.cpp

@@ -438,10 +438,10 @@ namespace Ogre {
 		// take this opportunity to enumerate the valid FSAA modes.
 		
 		LPCSTR dummyText = "OgreWglDummy";
-#ifdef OGRE_STATIC_LIB
+#ifdef CM_STATIC_LIB
 		HINSTANCE hinst = GetModuleHandle( NULL );
 #else
-#  if OGRE_DEBUG_MODE == 1
+#  if CM_DEBUG_MODE == 1
 		HINSTANCE hinst = GetModuleHandle("RenderSystem_GL_d.dll");
 #  else
 		HINSTANCE hinst = GetModuleHandle("RenderSystem_GL.dll");

CamelotRenderer/RenderSystemGL/Source/OgreWin32Window.cpp

@@ -72,10 +72,10 @@ namespace Ogre {
 		if (mHWnd)
 			destroy();
 
-#ifdef OGRE_STATIC_LIB
+#ifdef CM_STATIC_LIB
 		HINSTANCE hInst = GetModuleHandle( NULL );
 #else
-#  if OGRE_DEBUG_MODE == 1
+#  if CM_DEBUG_MODE == 1
 		HINSTANCE hInst = GetModuleHandle("RenderSystem_GL_d.dll");
 #  else
 		HINSTANCE hInst = GetModuleHandle("RenderSystem_GL.dll");

CamelotRenderer/RenderSystemGL/Source/nvparse/vp1.0_impl.cpp

@@ -4,7 +4,7 @@
 #include <string>
 #include <ctype.h>
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+#if CM_PLATFORM == CM_PLATFORM_APPLE
 #	include <OpenGL/glu.h>
 #else
 #	include <GL/glu.h>

CamelotRenderer/RenderSystemGL/Source/nvparse/vs1.0_inst_list.cpp

@@ -7,7 +7,7 @@
 #include "nvparse_externs.h"
 #include <string.h>
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+#if CM_PLATFORM == CM_PLATFORM_APPLE
 #	include <OpenGL/glu.h>
 #else
 #	include <GL/glu.h>

CamelotRenderer/RenderSystemGL/Source/nvparse/vsp1.0_impl.cpp

@@ -4,7 +4,7 @@
 #include <string>
 #include <ctype.h>
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+#if CM_PLATFORM == CM_PLATFORM_APPLE
 #	include <OpenGL/glu.h>
 #else
 #	include <GL/glu.h>

CamelotRenderer/asm_math.h

@@ -3,7 +3,7 @@
 
 #include "OgrePrerequisites.h"
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC
+#if  CM_COMPILER == CM_COMPILER_MSVC
 #  pragma warning (push)
 // disable "instruction may be inaccurate on some Pentiums"
 #  pragma warning (disable : 4725)
@@ -20,7 +20,7 @@ const float half_pi = 0.5f * pi;
 /*=============================================================================
 	NO EXPLICIT RETURN REQUIRED FROM THESE METHODS!! 
 =============================================================================*/
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC && OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC && CM_ARCH_TYPE == CM_ARCHITECTURE_32
 #	pragma warning( push )
 #	pragma warning( disable: 4035 ) 
 #endif
@@ -28,7 +28,7 @@ const float half_pi = 0.5f * pi;
 float asm_arccos( float r ) {
     // return half_pi + arctan( r / -sqr( 1.f - r * r ) );
 	
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 
     float asm_one = 1.f;
     float asm_half_pi = half_pi;
@@ -55,7 +55,7 @@ float asm_arccos( float r ) {
 float asm_arcsin( float r ) {
     // return arctan( r / sqr( 1.f - r * r ) );
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 
     const float asm_one = 1.f;
     __asm {
@@ -79,7 +79,7 @@ float asm_arcsin( float r ) {
 
 float asm_arctan( float r ) {
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 
     __asm {
         fld r // r0 = r
@@ -97,7 +97,7 @@ float asm_arctan( float r ) {
 
 float asm_sin( float r ) {
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 
     __asm {
         fld r // r0 = r
@@ -114,7 +114,7 @@ float asm_sin( float r ) {
 
 float asm_cos( float r ) {
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 
     __asm {
         fld r // r0 = r
@@ -130,7 +130,7 @@ float asm_cos( float r ) {
 
 float asm_tan( float r ) {
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 
     // return sin( r ) / cos( r );
     __asm {
@@ -151,7 +151,7 @@ float asm_tan( float r ) {
 // returns a for a * a = r
 float asm_sqrt( float r )
 {
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 
     __asm {
         fld r // r0 = r
@@ -169,7 +169,7 @@ float asm_sqrt( float r )
 // -- Use this for Vector normalisation!!!
 float asm_rsq( float r )
 {
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 
     __asm {
         fld1 // r0 = 1.f
@@ -189,7 +189,7 @@ float asm_rsq( float r )
 // Another version
 float apx_rsq( float r ) {
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 
     const float asm_dot5 = 0.5f;
     const float asm_1dot5 = 1.5f;
@@ -219,7 +219,7 @@ float apx_rsq( float r ) {
    Finally the best InvSqrt implementation?
    Use for vector normalisation instead of 1/length() * x,y,z
 */
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 
 __declspec(naked) float __fastcall InvSqrt(float fValue)
 {
@@ -265,9 +265,9 @@ __declspec(naked) float __fastcall InvSqrt(float fValue)
 FORCEINLINE float asm_rand()
 {
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
   #if 0
-    #if OGRE_COMP_VER >= 1300
+    #if CM_COMP_VER >= 1300
 
 	static unsigned __int64 q = time( NULL );
 
@@ -301,9 +301,9 @@ FORCEINLINE float asm_rand()
 FORCEINLINE float asm_rand_max()
 {
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
   #if 0
-    #if OGRE_COMP_VER >= 1300
+    #if CM_COMP_VER >= 1300
 
 	return (std::numeric_limits< unsigned __int64 >::max)();
 	return 9223372036854775807.0f;
@@ -323,7 +323,7 @@ FORCEINLINE float asm_rand_max()
 // returns log2( r ) / log2( e )
 float asm_ln( float r ) {    
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 
     const float asm_1_div_log2_e = .693147180559f;
     const float asm_neg1_div_3 = -.33333333333333333333333333333f;
@@ -364,12 +364,12 @@ float asm_ln( float r ) {
 #endif
 }
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 #	pragma warning( pop )
 #endif
 } // namespace
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC
+#if  CM_COMPILER == CM_COMPILER_MSVC
 #  pragma warning (pop)
 #endif
 

CamelotUtility/CamelotUtility.vcxproj

@@ -44,7 +44,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>Include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>OGRE_STATIC_LIB</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CM_STATIC_LIB</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -56,7 +56,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>OGRE_STATIC_LIB</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CM_STATIC_LIB</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>Include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
@@ -68,14 +68,14 @@
   <ItemGroup>
     <ClInclude Include="Include\asm_math.h" />
     <ClInclude Include="Include\CmTypes.h" />
-    <ClInclude Include="Include\CmUtilFwdDecl.h" />
+    <ClInclude Include="Include\CmFwdDeclUtil.h" />
     <ClInclude Include="Include\OgreAxisAlignedBox.h" />
     <ClInclude Include="Include\OgreMath.h" />
     <ClInclude Include="Include\OgreMatrix3.h" />
     <ClInclude Include="Include\OgreMatrix4.h" />
     <ClInclude Include="Include\OgrePlane.h" />
     <ClInclude Include="Include\CmPlatform.h" />
-    <ClInclude Include="Include\CmUtilPrerequisites.h" />
+    <ClInclude Include="Include\CmPrerequisitesUtil.h" />
     <ClInclude Include="Include\OgreQuaternion.h" />
     <ClInclude Include="Include\OgreRay.h" />
     <ClInclude Include="Include\OgreSphere.h" />

CamelotUtility/CamelotUtility.vcxproj.filters

@@ -54,9 +54,6 @@
     <ClInclude Include="Include\OgreVector4.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Include\CmUtilPrerequisites.h">
-      <Filter>Header Files\Prerequisites</Filter>
-    </ClInclude>
     <ClInclude Include="Include\CmTypes.h">
       <Filter>Header Files\Prerequisites</Filter>
     </ClInclude>
@@ -69,7 +66,10 @@
     <ClInclude Include="Include\CmThreadDefines.h">
       <Filter>Header Files\Prerequisites</Filter>
     </ClInclude>
-    <ClInclude Include="Include\CmUtilFwdDecl.h">
+    <ClInclude Include="Include\CmPrerequisitesUtil.h">
+      <Filter>Header Files\Prerequisites</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\CmFwdDeclUtil.h">
       <Filter>Header Files\Prerequisites</Filter>
     </ClInclude>
   </ItemGroup>

CamelotUtility/Include/CmPlatform.h

@@ -30,40 +30,40 @@ THE SOFTWARE.
 namespace CamelotEngine {
 /* Initial platform/compiler-related stuff to set.
 */
-#define OGRE_PLATFORM_WIN32 1
-#define OGRE_PLATFORM_LINUX 2
-#define OGRE_PLATFORM_APPLE 3
+#define CM_PLATFORM_WIN32 1
+#define CM_PLATFORM_LINUX 2
+#define CM_PLATFORM_APPLE 3
 
-#define OGRE_COMPILER_MSVC 1
-#define OGRE_COMPILER_GNUC 2
-#define OGRE_COMPILER_BORL 3
-#define OGRE_COMPILER_WINSCW 4
-#define OGRE_COMPILER_GCCE 5
+#define CM_COMPILER_MSVC 1
+#define CM_COMPILER_GNUC 2
+#define CM_COMPILER_BORL 3
+#define CM_COMPILER_WINSCW 4
+#define CM_COMPILER_GCCE 5
 
-#define OGRE_ARCHITECTURE_32 1
-#define OGRE_ARCHITECTURE_64 2
+#define CM_ARCHITECTURE_32 1
+#define CM_ARCHITECTURE_64 2
 
 /* Finds the compiler type and version.
 */
 #if defined( __GCCE__ )
-#   define OGRE_COMPILER OGRE_COMPILER_GCCE
-#   define OGRE_COMP_VER _MSC_VER
+#   define CM_COMPILER CM_COMPILER_GCCE
+#   define CM_COMP_VER _MSC_VER
 //#	include <staticlibinit_gcce.h> // This is a GCCE toolchain workaround needed when compiling with GCCE 
 #elif defined( __WINSCW__ )
-#   define OGRE_COMPILER OGRE_COMPILER_WINSCW
-#   define OGRE_COMP_VER _MSC_VER
+#   define CM_COMPILER CM_COMPILER_WINSCW
+#   define CM_COMP_VER _MSC_VER
 #elif defined( _MSC_VER )
-#   define OGRE_COMPILER OGRE_COMPILER_MSVC
-#   define OGRE_COMP_VER _MSC_VER
+#   define CM_COMPILER CM_COMPILER_MSVC
+#   define CM_COMP_VER _MSC_VER
 #elif defined( __GNUC__ )
-#   define OGRE_COMPILER OGRE_COMPILER_GNUC
-#   define OGRE_COMP_VER (((__GNUC__)*100) + \
+#   define CM_COMPILER CM_COMPILER_GNUC
+#   define CM_COMP_VER (((__GNUC__)*100) + \
         (__GNUC_MINOR__*10) + \
         __GNUC_PATCHLEVEL__)
 
 #elif defined( __BORLANDC__ )
-#   define OGRE_COMPILER OGRE_COMPILER_BORL
-#   define OGRE_COMP_VER __BCPLUSPLUS__
+#   define CM_COMPILER CM_COMPILER_BORL
+#   define CM_COMP_VER __BCPLUSPLUS__
 #   define __FUNCTION__ __FUNC__ 
 #else
 #   pragma error "No known compiler. Abort! Abort!"
@@ -71,8 +71,8 @@ namespace CamelotEngine {
 #endif
 
 /* See if we can use __forceinline or if we need to use __inline instead */
-#if OGRE_COMPILER == OGRE_COMPILER_MSVC
-#   if OGRE_COMP_VER >= 1200
+#if CM_COMPILER == CM_COMPILER_MSVC
+#   if CM_COMP_VER >= 1200
 #       define FORCEINLINE __forceinline
 #   endif
 #elif defined(__MINGW32__)
@@ -86,39 +86,32 @@ namespace CamelotEngine {
 /* Finds the current platform */
 
 #if defined( __WIN32__ ) || defined( _WIN32 )
-#   define OGRE_PLATFORM OGRE_PLATFORM_WIN32
+#   define CM_PLATFORM CM_PLATFORM_WIN32
 #elif defined( __APPLE_CC__)
-#   define OGRE_PLATFORM OGRE_PLATFORM_APPLE
+#   define CM_PLATFORM CM_PLATFORM_APPLE
 #else
-#   define OGRE_PLATFORM OGRE_PLATFORM_LINUX
+#   define CM_PLATFORM CM_PLATFORM_LINUX
 #endif
 
     /* Find the arch type */
 #if defined(__x86_64__) || defined(_M_X64) || defined(__powerpc64__) || defined(__alpha__) || defined(__ia64__) || defined(__s390__) || defined(__s390x__)
-#   define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_64
+#   define CM_ARCH_TYPE CM_ARCHITECTURE_64
 #else
-#   define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_32
+#   define CM_ARCH_TYPE CM_ARCHITECTURE_32
 #endif
 
-// For generating compiler warnings - should work on any compiler
-// As a side note, if you start your message with 'Warning: ', the MSVC
-// IDE actually does catch a warning :)
-#define OGRE_QUOTE_INPLACE(x) # x
-#define OGRE_QUOTE(x) OGRE_QUOTE_INPLACE(x)
-#define OGRE_WARN( x )  message( __FILE__ "(" QUOTE( __LINE__ ) ") : " x "\n" )
-
 //----------------------------------------------------------------------------
 // Windows Settings
-#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#if CM_PLATFORM == CM_PLATFORM_WIN32
 
 // If we're not including this from a client build, specify that the stuff
 // should get exported. Otherwise, import it.
-#	if defined( OGRE_STATIC_LIB )
+#	if defined( CM_STATIC_LIB )
 		// Linux compilers don't have symbol import/export directives.
 #   	define _OgreExport
 #   	define _OgrePrivate
 #   else
-#   	if defined( OGRE_NONCLIENT_BUILD )
+#   	if defined( CM_NONCLIENT_BUILD )
 #       	define _OgreExport __declspec( dllexport )
 #   	else
 #           if defined( __MINGW32__ )
@@ -132,42 +125,19 @@ namespace CamelotEngine {
 // Win32 compilers use _DEBUG for specifying debug builds.
 // for MinGW, we set DEBUG
 #   if defined(_DEBUG) || defined(DEBUG)
-#       define OGRE_DEBUG_MODE 1
-#   else
-#       define OGRE_DEBUG_MODE 0
-#   endif
-
-// Disable unicode support on MingW for GCC 3, poorly supported in stdlibc++
-// STLPORT fixes this though so allow if found
-// MinGW C++ Toolkit supports unicode and sets the define __MINGW32_TOOLBOX_UNICODE__ in _mingw.h
-// GCC 4 is also fine
-#if defined(__MINGW32__)
-# if OGRE_COMP_VER < 400
-#  if !defined(_STLPORT_VERSION)
-#   include<_mingw.h>
-#   if defined(__MINGW32_TOOLBOX_UNICODE__) || OGRE_COMP_VER > 345
-#    define OGRE_UNICODE_SUPPORT 1
+#       define CM_DEBUG_MODE 1
 #   else
-#    define OGRE_UNICODE_SUPPORT 0
+#       define CM_DEBUG_MODE 0
 #   endif
-#  else
-#   define OGRE_UNICODE_SUPPORT 1
-#  endif
-# else
-#  define OGRE_UNICODE_SUPPORT 1
-# endif
-#else
-#  define OGRE_UNICODE_SUPPORT 1
-#endif
 
 #endif // OGRE_PLATFORM == OGRE_PLATFORM_WIN32
 
 //----------------------------------------------------------------------------
 // Linux/Apple/Symbian Settings
-#if OGRE_PLATFORM == OGRE_PLATFORM_LINUX || OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+#if CM_PLATFORM == CM_PLATFORM_LINUX || CM_PLATFORM == CM_PLATFORM_APPLE
 
 // Enable GCC symbol visibility
-#   if defined( OGRE_GCC_VISIBILITY )
+#   if defined( CM_GCC_VISIBILITY )
 #       define _OgreExport  __attribute__ ((visibility("default")))
 #       define _OgrePrivate __attribute__ ((visibility("hidden")))
 #   else
@@ -183,15 +153,15 @@ namespace CamelotEngine {
 // (??? this is wrong, on Linux debug builds aren't marked in any way unless
 // you mark it yourself any way you like it -- zap ???)
 #   ifdef DEBUG
-#       define OGRE_DEBUG_MODE 1
+#       define CM_DEBUG_MODE 1
 #   else
-#       define OGRE_DEBUG_MODE 0
+#       define CM_DEBUG_MODE 0
 #   endif
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
-    #define OGRE_PLATFORM_LIB "CmPlatform.bundle"
+#if CM_PLATFORM == CM_PLATFORM_APPLE
+    #define CM_PLATFORM_LIB "CmPlatform.bundle"
 #else //OGRE_PLATFORM_LINUX
-    #define OGRE_PLATFORM_LIB "libCmPlatform.so"
+    #define CM_PLATFORM_LIB "libCmPlatform.so"
 #endif
 
 #endif
@@ -200,47 +170,47 @@ namespace CamelotEngine {
 
 /* Initial CPU stuff to set.
 */
-#define OGRE_CPU_UNKNOWN    0
-#define OGRE_CPU_X86        1
-#define OGRE_CPU_PPC        2
+#define CM_CPU_UNKNOWN    0
+#define CM_CPU_X86        1
+#define CM_CPU_PPC        2
 
 /* Find CPU type
 */
 #if (defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))) || \
     (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)))
-#   define OGRE_CPU OGRE_CPU_X86
+#   define CM_CPU CM_CPU_X86
 
-#elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE && defined(__BIG_ENDIAN__)
-#   define OGRE_CPU OGRE_CPU_PPC
-#elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE
-#	define OGRE_CPU OGRE_CPU_X86
+#elif CM_PLATFORM == CM_PLATFORM_APPLE && defined(__BIG_ENDIAN__)
+#   define CM_CPU CM_CPU_PPC
+#elif CM_PLATFORM == CM_PLATFORM_APPLE
+#	define CM_CPU CM_CPU_X86
 #else
-#   define OGRE_CPU OGRE_CPU_UNKNOWN
+#   define CM_CPU CM_CPU_UNKNOWN
 #endif
 
 /* Find how to declare aligned variable.
 */
-#if OGRE_COMPILER == OGRE_COMPILER_MSVC
-#   define OGRE_ALIGNED_DECL(type, var, alignment)  __declspec(align(alignment)) type var
+#if CM_COMPILER == CM_COMPILER_MSVC
+#   define CM_ALIGNED_DECL(type, var, alignment)  __declspec(align(alignment)) type var
 
-#elif OGRE_COMPILER == OGRE_COMPILER_GNUC
-#   define OGRE_ALIGNED_DECL(type, var, alignment)  type var __attribute__((__aligned__(alignment)))
+#elif CM_COMPILER == CM_COMPILER_GNUC
+#   define CM_ALIGNED_DECL(type, var, alignment)  type var __attribute__((__aligned__(alignment)))
 
 #else
-#   define OGRE_ALIGNED_DECL(type, var, alignment)  type var
+#   define CM_ALIGNED_DECL(type, var, alignment)  type var
 #endif
 
 /** Find perfect alignment (should supports SIMD alignment if SIMD available)
 */
-#if OGRE_CPU == OGRE_CPU_X86
-#   define OGRE_SIMD_ALIGNMENT  16
+#if CM_CPU == CM_CPU_X86
+#   define CM_SIMD_ALIGNMENT  16
 
 #else
-#   define OGRE_SIMD_ALIGNMENT  16
+#   define CM_SIMD_ALIGNMENT  16
 #endif
 
 /* Declare variable aligned to SIMD alignment.
 */
-#define OGRE_SIMD_ALIGNED_DECL(type, var)   OGRE_ALIGNED_DECL(type, var, OGRE_SIMD_ALIGNMENT)
+#define CM_SIMD_ALIGNED_DECL(type, var)   CM_ALIGNED_DECL(type, var, CM_SIMD_ALIGNMENT)
 
 }

CamelotUtility/Include/CmUtilPrerequisites.h → CamelotUtility/Include/CmPrerequisitesUtil.h

@@ -37,7 +37,7 @@ THE SOFTWARE
 #include "CmThreadDefines.h"
 
 // Forward declarations
-#include "CmUtilFwdDecl.h"
+#include "CmFwdDeclUtil.h"
 
 // Commonly used standard headers
 #include "CmStdHeaders.h"

CamelotUtility/Include/CmStdHeaders.h

@@ -4,7 +4,7 @@
     #define __STD_ALGORITHM
 #endif
 
-#if defined ( OGRE_GCC_VISIBILITY ) && (OGRE_PLATFORM != OGRE_PLATFORM_APPLE)
+#if defined ( CM_GCC_VISIBILITY ) && (CM_PLATFORM != CM_PLATFORM_APPLE)
 /* Until libstdc++ for gcc 4.2 is released, we have to declare all
  * symbols in libstdc++.so externally visible, otherwise we end up
  * with them marked as hidden by -fvisible=hidden.
@@ -40,8 +40,8 @@
 
 // Note - not in the original STL, but exists in SGI STL and STLport
 // For gcc 4.3 see http://gcc.gnu.org/gcc-4.3/changes.html
-#if (OGRE_COMPILER == OGRE_COMPILER_GNUC)
-#   if OGRE_COMP_VER >= 430
+#if (CM_COMPILER == CM_COMPILER_GNUC)
+#   if CM_COMP_VER >= 430
 #       include <tr1/unordered_map>
 #       include <tr1/unordered_set> 
 #   else
@@ -49,7 +49,7 @@
 #       include <ext/hash_set>
 #   endif
 #else
-#   if (OGRE_COMPILER == OGRE_COMPILER_MSVC) && OGRE_COMP_VER >= 1600 // VC++ 10.0
+#   if (CM_COMPILER == CM_COMPILER_MSVC) && CM_COMP_VER >= 1600 // VC++ 10.0
 #    	include <unordered_map>
 #    	include <unordered_set>
 #	else
@@ -83,7 +83,7 @@ extern "C" {
 
 }
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#if CM_PLATFORM == CM_PLATFORM_WIN32
 #  undef min
 #  undef max
 #	if !defined(NOMINMAX) && defined(_MSC_VER)
@@ -94,7 +94,7 @@ extern "C" {
 #  endif
 #endif
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_LINUX
+#if CM_PLATFORM == CM_PLATFORM_LINUX
 extern "C" {
 
 #   include <unistd.h>
@@ -103,7 +103,7 @@ extern "C" {
 }
 #endif
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+#if CM_PLATFORM == CM_PLATFORM_APPLE
 extern "C" {
 #   include <unistd.h>
 #   include <sys/param.h>
@@ -111,14 +111,14 @@ extern "C" {
 }
 #endif
 
-#if defined ( OGRE_GCC_VISIBILITY ) && (OGRE_PLATFORM != OGRE_PLATFORM_APPLE)
+#if defined ( CM_GCC_VISIBILITY ) && (CM_PLATFORM != CM_PLATFORM_APPLE)
 #   pragma GCC visibility pop
 #endif
 
 namespace CamelotEngine
 {
-#if OGRE_COMPILER == OGRE_COMPILER_GNUC && OGRE_COMP_VER >= 310
-#   if OGRE_COMP_VER >= 430
+#if CM_COMPILER == CM_COMPILER_GNUC && CM_COMP_VER >= 310
+#   if CM_COMP_VER >= 430
 #       define HashMap ::std::tr1::unordered_map
 #		define HashSet ::std::tr1::unordered_set
 #    else
@@ -126,11 +126,11 @@ namespace CamelotEngine
 #       define HashSet ::__gnu_cxx::hash_set
 #    endif
 #else
-#   if OGRE_COMPILER == OGRE_COMPILER_MSVC
-#       if OGRE_COMP_VER >= 1600 // VC++ 10.0
+#   if CM_COMPILER == CM_COMPILER_MSVC
+#       if CM_COMP_VER >= 1600 // VC++ 10.0
 #			define HashMap ::std::tr1::unordered_map
 #           define HashSet ::std::tr1::unordered_set
-#		elif OGRE_COMP_VER > 1300 && !defined(_STLP_MSVC)
+#		elif CM_COMP_VER > 1300 && !defined(_STLP_MSVC)
 #           define HashMap ::stdext::hash_map
 #           define HashSet ::stdext::hash_set
 #       else

CamelotUtility/Include/CmTypes.h

@@ -12,7 +12,7 @@ namespace CamelotEngine
 	typedef unsigned int UINT32;
 	typedef unsigned short WCHAR;
 
-#if OGRE_COMPILER == OGRE_COMPILER_MSVC
+#if CM_COMPILER == CM_COMPILER_MSVC
 	typedef unsigned __int64 UINT64;
 	typedef __int64 INT64;
 #else

CamelotUtility/Include/OgreAxisAlignedBox.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __AxisAlignedBox_H_
 
 // Precompiler options
-#include "CmUtilPrerequisites.h"
+#include "CmPrerequisitesUtil.h"
 
 #include "OgreVector3.h"
 #include "OgreMatrix4.h"

CamelotUtility/Include/OgreMath.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __Math_H__
 #define __Math_H__
 
-#include "CmUtilPrerequisites.h"
+#include "CmPrerequisitesUtil.h"
 
 namespace CamelotEngine
 {

CamelotUtility/Include/OgreMatrix3.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __Matrix3_H__
 #define __Matrix3_H__
 
-#include "CmUtilPrerequisites.h"
+#include "CmPrerequisitesUtil.h"
 
 #include "OgreVector3.h"
 

CamelotUtility/Include/OgreMatrix4.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __Matrix4__
 
 // Precompiler options
-#include "CmUtilPrerequisites.h"
+#include "CmPrerequisitesUtil.h"
 
 #include "OgreVector3.h"
 #include "OgreMatrix3.h"

CamelotUtility/Include/OgrePlane.h

@@ -36,7 +36,7 @@ THE SOFTWARE.
 #ifndef __Plane_H__
 #define __Plane_H__
 
-#include "CmUtilPrerequisites.h"
+#include "CmPrerequisitesUtil.h"
 
 #include "OgreVector3.h"
 

CamelotUtility/Include/OgreQuaternion.h

@@ -36,7 +36,7 @@ THE SOFTWARE.
 #ifndef __Quaternion_H__
 #define __Quaternion_H__
 
-#include "CmUtilPrerequisites.h"
+#include "CmPrerequisitesUtil.h"
 #include "OgreMath.h"
 
 namespace CamelotEngine {

CamelotUtility/Include/OgreRay.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __Ray_H_
 
 // Precompiler options
-#include "CmUtilPrerequisites.h"
+#include "CmPrerequisitesUtil.h"
 
 #include "OgreVector3.h"
 

CamelotUtility/Include/OgreSphere.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __Sphere_H_
 
 // Precompiler options
-#include "CmUtilPrerequisites.h"
+#include "CmPrerequisitesUtil.h"
 
 #include "OgreVector3.h"
 

CamelotUtility/Include/OgreVector2.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __Vector2_H__
 
 
-#include "CmUtilPrerequisites.h"
+#include "CmPrerequisitesUtil.h"
 #include "OgreMath.h"
 
 namespace CamelotEngine

CamelotUtility/Include/OgreVector3.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __Vector3_H__
 #define __Vector3_H__
 
-#include "CmUtilPrerequisites.h"
+#include "CmPrerequisitesUtil.h"
 #include "OgreMath.h"
 #include "OgreQuaternion.h"
 

CamelotUtility/Include/OgreVector4.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __Vector4_H__
 #define __Vector4_H__
 
-#include "CmUtilPrerequisites.h"
+#include "CmPrerequisitesUtil.h"
 #include "OgreVector3.h"
 
 namespace CamelotEngine

CamelotUtility/Include/asm_math.h

@@ -1,9 +1,9 @@
 #ifndef __asm_math_H__
 #define __asm_math_H__
 
-#include "CmUtilPrerequisites.h"
+#include "CmPrerequisitesUtil.h"
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC
+#if  CM_COMPILER == CM_COMPILER_MSVC
 #  pragma warning (push)
 // disable "instruction may be inaccurate on some Pentiums"
 #  pragma warning (disable : 4725)
@@ -20,7 +20,7 @@ const float half_pi = 0.5f * pi;
 /*=============================================================================
 	NO EXPLICIT RETURN REQUIRED FROM THESE METHODS!! 
 =============================================================================*/
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC && OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC && CM_ARCH_TYPE == CM_ARCHITECTURE_32
 #	pragma warning( push )
 #	pragma warning( disable: 4035 ) 
 #endif
@@ -28,7 +28,7 @@ const float half_pi = 0.5f * pi;
 float asm_arccos( float r ) {
     // return half_pi + arctan( r / -sqr( 1.f - r * r ) );
 	
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 
     float asm_one = 1.f;
     float asm_half_pi = half_pi;
@@ -55,7 +55,7 @@ float asm_arccos( float r ) {
 float asm_arcsin( float r ) {
     // return arctan( r / sqr( 1.f - r * r ) );
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 
     const float asm_one = 1.f;
     __asm {
@@ -79,7 +79,7 @@ float asm_arcsin( float r ) {
 
 float asm_arctan( float r ) {
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 
     __asm {
         fld r // r0 = r
@@ -97,7 +97,7 @@ float asm_arctan( float r ) {
 
 float asm_sin( float r ) {
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 
     __asm {
         fld r // r0 = r
@@ -114,7 +114,7 @@ float asm_sin( float r ) {
 
 float asm_cos( float r ) {
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 
     __asm {
         fld r // r0 = r
@@ -130,7 +130,7 @@ float asm_cos( float r ) {
 
 float asm_tan( float r ) {
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 
     // return sin( r ) / cos( r );
     __asm {
@@ -151,7 +151,7 @@ float asm_tan( float r ) {
 // returns a for a * a = r
 float asm_sqrt( float r )
 {
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 
     __asm {
         fld r // r0 = r
@@ -169,7 +169,7 @@ float asm_sqrt( float r )
 // -- Use this for Vector normalisation!!!
 float asm_rsq( float r )
 {
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 
     __asm {
         fld1 // r0 = 1.f
@@ -189,7 +189,7 @@ float asm_rsq( float r )
 // Another version
 float apx_rsq( float r ) {
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 
     const float asm_dot5 = 0.5f;
     const float asm_1dot5 = 1.5f;
@@ -219,7 +219,7 @@ float apx_rsq( float r ) {
    Finally the best InvSqrt implementation?
    Use for vector normalisation instead of 1/length() * x,y,z
 */
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 
 __declspec(naked) float __fastcall InvSqrt(float fValue)
 {
@@ -265,9 +265,9 @@ __declspec(naked) float __fastcall InvSqrt(float fValue)
 FORCEINLINE float asm_rand()
 {
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
   #if 0
-    #if OGRE_COMP_VER >= 1300
+    #if CM_COMP_VER >= 1300
 
 	static unsigned __int64 q = time( NULL );
 
@@ -301,9 +301,9 @@ FORCEINLINE float asm_rand()
 FORCEINLINE float asm_rand_max()
 {
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
   #if 0
-    #if OGRE_COMP_VER >= 1300
+    #if CM_COMP_VER >= 1300
 
 	return (std::numeric_limits< unsigned __int64 >::max)();
 	return 9223372036854775807.0f;
@@ -323,7 +323,7 @@ FORCEINLINE float asm_rand_max()
 // returns log2( r ) / log2( e )
 float asm_ln( float r ) {    
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 
     const float asm_1_div_log2_e = .693147180559f;
     const float asm_neg1_div_3 = -.33333333333333333333333333333f;
@@ -364,12 +364,12 @@ float asm_ln( float r ) {
 #endif
 }
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC &&  OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_32
+#if  CM_COMPILER == CM_COMPILER_MSVC &&  CM_ARCH_TYPE == CM_ARCHITECTURE_32
 #	pragma warning( pop )
 #endif
 } // namespace
 
-#if  OGRE_COMPILER == OGRE_COMPILER_MSVC
+#if  CM_COMPILER == CM_COMPILER_MSVC
 #  pragma warning (pop)
 #endif