24c24,31
< template<> Caelum::CaelumPlugin* Ogre::Singleton<Caelum::CaelumPlugin>::ms_Singleton = 0;
---
> // ms_Singleton was renamed to msSingleton in ogre 1.8
> #if OGRE_VERSION_MINOR < 8
> 	#define SINGLETON_MEMBER ms_Singleton
> #else
> 	#define SINGLETON_MEMBER msSingleton
> #endif
> 
> template<> Caelum::CaelumPlugin* Ogre::Singleton<Caelum::CaelumPlugin>::SINGLETON_MEMBER = 0;
29c36
<         return ms_Singleton;
---
>         return SINGLETON_MEMBER;
33,34c40,41
<         assert (ms_Singleton);
<         return *ms_Singleton;  
---
>         assert (SINGLETON_MEMBER);
>         return *SINGLETON_MEMBER;