From 24d573e4535725e165769c11bfb7de4370891511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 29 Apr 2015 20:15:14 +0200 Subject: [PATCH] Fix linkage for local ResourceManager instance on MSVC. I feared that this would be much more complicated. --- src/Magnum/ResourceManager.hpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Magnum/ResourceManager.hpp b/src/Magnum/ResourceManager.hpp index 44ffc3d02..16b7f2127 100644 --- a/src/Magnum/ResourceManager.hpp +++ b/src/Magnum/ResourceManager.hpp @@ -38,7 +38,11 @@ namespace Magnum { namespace Implementation { -template CORRADE_VISIBILITY_EXPORT ResourceManager*& ResourceManagerLocalInstanceImplementation::internalInstance() { +template +#ifndef _MSC_VER +CORRADE_VISIBILITY_EXPORT +#endif +ResourceManager*& ResourceManagerLocalInstanceImplementation::internalInstance() { static ResourceManager* _instance(nullptr); return _instance; }