diff options
| author | Max Horn | 2004-12-28 20:29:42 +0000 |
|---|---|---|
| committer | Max Horn | 2004-12-28 20:29:42 +0000 |
| commit | b15d92e470fa09a76540b42d1ab1b6f24515ee74 (patch) | |
| tree | e0df2f5f80e2a0fc635e054d68968cb9dd2a8708 /common | |
| parent | 49393c0f414d5f5b02cf2e7ee04e3b14b1954539 (diff) | |
| download | scummvm-rg350-b15d92e470fa09a76540b42d1ab1b6f24515ee74.tar.gz scummvm-rg350-b15d92e470fa09a76540b42d1ab1b6f24515ee74.tar.bz2 scummvm-rg350-b15d92e470fa09a76540b42d1ab1b6f24515ee74.zip | |
Fix running ScummVM in plugin-mode
svn-id: r16360
Diffstat (limited to 'common')
| -rw-r--r-- | common/config-manager.cpp | 2 | ||||
| -rw-r--r-- | common/singleton.h | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/common/config-manager.cpp b/common/config-manager.cpp index 5bf26fbe50..fc7bbdfec1 100644 --- a/common/config-manager.cpp +++ b/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" diff --git a/common/singleton.h b/common/singleton.h index d259102e07..8ea666cbed 100644 --- a/common/singleton.h +++ b/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 |