From 14ea7dd072560dc5ce1daafdfe5d103840eb3651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 5 Dec 2013 17:39:26 +0100 Subject: [PATCH] DebugTools: fix linking on Windows. MSVC complained about dllexporting already exported interface or what. MinGW doesn't care. --- src/DebugTools/ResourceManager.cpp | 4 ++++ src/DebugTools/ResourceManager.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/DebugTools/ResourceManager.cpp b/src/DebugTools/ResourceManager.cpp index 6b385af7d..8a8491f55 100644 --- a/src/DebugTools/ResourceManager.cpp +++ b/src/DebugTools/ResourceManager.cpp @@ -35,7 +35,11 @@ namespace Magnum { +#ifndef _WIN32 template class ResourceManager; +#else +template class MAGNUM_DEBUGTOOLS_EXPORT ResourceManager; +#endif namespace DebugTools { diff --git a/src/DebugTools/ResourceManager.h b/src/DebugTools/ResourceManager.h index f5205e044..c83ecd7a2 100644 --- a/src/DebugTools/ResourceManager.h +++ b/src/DebugTools/ResourceManager.h @@ -45,7 +45,11 @@ namespace Magnum { /** @todo Do the listing in one place, not five thousand! */ +#ifndef _WIN32 extern template ResourceManager MAGNUM_DEBUGTOOLS_EXPORT *& ResourceManager::internalInstance(); +#else +extern template class MAGNUM_DEBUGTOOLS_EXPORT ResourceManager; +#endif namespace DebugTools {