mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-03-03 09:19:41 +00:00
Issue #178 - workaround for compilation problems with ogre 1.8.0.
This commit is contained in:
parent
022f0fd5bd
commit
37e272b3b5
2 changed files with 10 additions and 4 deletions
|
@ -221,6 +221,12 @@ class BSAArchive : public Archive
|
|||
{
|
||||
BSAFile arc;
|
||||
|
||||
FileInfoListPtr findFileInfo(const String&, bool, bool) const
|
||||
{
|
||||
static FileInfoListPtr filp(new FileInfoList());
|
||||
return filp;
|
||||
}
|
||||
|
||||
public:
|
||||
BSAArchive(const String& name)
|
||||
: Archive(name, "BSA")
|
||||
|
|
8
extern/caelum/src/CaelumPlugin.cpp
vendored
8
extern/caelum/src/CaelumPlugin.cpp
vendored
|
@ -21,17 +21,17 @@ along with Caelum. If not, see <http://www.gnu.org/licenses/>.
|
|||
#include "CaelumPrecompiled.h"
|
||||
#include "CaelumPlugin.h"
|
||||
|
||||
template<> Caelum::CaelumPlugin* Ogre::Singleton<Caelum::CaelumPlugin>::ms_Singleton = 0;
|
||||
template<> Caelum::CaelumPlugin* Ogre::Singleton<Caelum::CaelumPlugin>::msSingleton = 0;
|
||||
|
||||
namespace Caelum
|
||||
{
|
||||
CaelumPlugin* CaelumPlugin::getSingletonPtr () {
|
||||
return ms_Singleton;
|
||||
return msSingleton;
|
||||
}
|
||||
|
||||
CaelumPlugin& CaelumPlugin::getSingleton () {
|
||||
assert (ms_Singleton);
|
||||
return *ms_Singleton;
|
||||
assert (msSingleton);
|
||||
return *msSingleton;
|
||||
}
|
||||
|
||||
extern "C" void CAELUM_EXPORT dllStartPlugin () {
|
||||
|
|
Loading…
Reference in a new issue