diff options
Diffstat (limited to 'caelumplugin.patch')
| -rw-r--r-- | caelumplugin.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/caelumplugin.patch b/caelumplugin.patch new file mode 100644 index 000000000000..e69e7bb39c2e --- /dev/null +++ b/caelumplugin.patch @@ -0,0 +1,21 @@ +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; |