1 files changed, 33 insertions, 21 deletions
diff --git a/caelumplugin.patch b/caelumplugin.patch
index ceed0ff753af..385fb1a2f643 100644
--- a/caelumplugin.patch
+++ b/caelumplugin.patch
@@ -1,21 +1,33 @@
-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;
+--- main/src/CaelumPlugin.cpp
++++ main/src/CaelumPlugin.cpp
+
+@@ -21,17 +21,24 @@
+ #include "CaelumPrecompiled.h"
+ #include "CaelumPlugin.h"
+ 
+-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;
+ 
+ namespace Caelum
+ {
+ 	CaelumPlugin* CaelumPlugin::getSingletonPtr () {
+-        return ms_Singleton;
++        return SINGLETON_MEMBER;
+     }
+ 
+     CaelumPlugin& CaelumPlugin::getSingleton () {  
+-        assert (ms_Singleton);
+-        return *ms_Singleton;  
++        assert (SINGLETON_MEMBER);
++        return *SINGLETON_MEMBER;
+     }
+ 
+     extern "C" void CAELUM_EXPORT dllStartPlugin () {
+