From b2a5f535d75b37cfbf8839da198ec360c5e78c9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 14 Nov 2012 14:48:11 +0100 Subject: [PATCH] ResourceManager: allow users to instantiate internalInstance() only once. It is cumbersome, but otherwise the linking (on mingw) fails with multiple definition errors. --- src/ResourceManager.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ResourceManager.h b/src/ResourceManager.h index 3935815ea..f603a8616 100644 --- a/src/ResourceManager.h +++ b/src/ResourceManager.h @@ -567,10 +567,12 @@ template class ResourceManager: protected Implementation::Resour static ResourceManager*& internalInstance(); }; +#ifndef MAGNUM_RESOURCEMANAGER_DONT_DEFINE_INTERNALINSTANCE template ResourceManager*& ResourceManager::internalInstance() { static ResourceManager* _instance(nullptr); return _instance; } +#endif /** @debugoperator{Magnum::ResourceKey} */ template inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const ResourceKey& value) {