blob: 385fb1a2f6436577988928b1d121e7523739f59e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
--- 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 () {
|