Fix running ScummVM in plugin-mode

svn-id: r16360

base/plugins.cpp

@@ -196,6 +196,8 @@ void DynamicPlugin::unloadPlugin() {
 
 #pragma mark -
 
+DECLARE_SINGLETON(PluginManager);
+
 PluginManager::PluginManager() {
 }
 

common/config-manager.cpp

@@ -24,6 +24,8 @@
 
 #include "common/config-manager.h"
 
+DECLARE_SINGLETON(Common::ConfigManager);
+
 #if defined(UNIX)
 #ifdef MACOSX
 #define DEFAULT_CONFIG_FILE "Library/Preferences/ScummVM Preferences"

common/singleton.h

@@ -55,8 +55,12 @@ protected:
 	~Singleton<T>()		{ }
 }; 
 
-template <class T>
-T* Singleton<T>::_singleton=0;
+//TODO: The following poses a problem when building ScummVM with plugins...
+
+//template <class T>
+//T* Singleton<T>::_singleton=0;
+
+#define DECLARE_SINGLETON(T) T* Common::Singleton<T>::_singleton=0
 
 }	// End of namespace Common
 

gui/newgui.cpp

@@ -28,6 +28,8 @@
 //#define NEW_FONT_CODE
 
 
+DECLARE_SINGLETON(GUI::NewGui);
+
 
 namespace GUI {
 

sound/audiocd.cpp

@@ -57,6 +57,8 @@ static const TrackFormat TRACK_FORMATS[] = {
 };
 
 
+DECLARE_SINGLETON(AudioCDManager);
+
 AudioCDManager::AudioCDManager() {
 	memset(&_cd, 0, sizeof(_cd));
 	memset(_cached_tracks, 0, sizeof(_cached_tracks));