[Scummvm-cvs-logs] CVS: scummvm/common config-manager.cpp,1.27,1.28 singleton.h,1.4,1.5

[Max Horn]

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30748/common

Modified Files:
	config-manager.cpp singleton.h 
Log Message:
Fix running ScummVM in plugin-mode

Index: config-manager.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-manager.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- config-manager.cpp	25 Dec 2004 19:03:13 -0000	1.27
+++ config-manager.cpp	28 Dec 2004 20:29:37 -0000	1.28
@@ -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"

Index: singleton.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/singleton.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- singleton.h	6 Jan 2004 12:45:28 -0000	1.4
+++ singleton.h	28 Dec 2004 20:29:42 -0000	1.5
@@ -55,8 +55,12 @@
 	~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