diff options
| author | Andre Heider | 2010-09-05 15:26:00 +0000 |
|---|---|---|
| committer | Andre Heider | 2010-09-05 15:26:00 +0000 |
| commit | 09834b8bec5fdaf24719988376debf8671518846 (patch) | |
| tree | fd25fc6b22f8935d4ccd30c122c972106b6ca52a /base | |
| parent | 402c71860f0a6f254604b1fbd1a763d470c859c0 (diff) | |
| parent | 13e24af0cace8599d31c8bb7381fa9fce49a8e6e (diff) | |
| download | scummvm-rg350-09834b8bec5fdaf24719988376debf8671518846.tar.gz scummvm-rg350-09834b8bec5fdaf24719988376debf8671518846.tar.bz2 scummvm-rg350-09834b8bec5fdaf24719988376debf8671518846.zip | |
MERGE: Merge trunk to branch.
svn-id: r52564
Diffstat (limited to 'base')
| -rw-r--r-- | base/internal_version.h | 4 | ||||
| -rw-r--r-- | base/internal_version.h.in | 4 | ||||
| -rw-r--r-- | base/plugins.cpp | 8 | ||||
| -rw-r--r-- | base/version.cpp | 4 |
4 files changed, 19 insertions, 1 deletions
diff --git a/base/internal_version.h b/base/internal_version.h index 2e6b7a24ad..5fd0535142 100644 --- a/base/internal_version.h +++ b/base/internal_version.h @@ -1,3 +1,7 @@ +#ifndef INCLUDED_FROM_BASE_VERSION_CPP +#error This file may only be included by base/version.cpp +#endif + #ifndef SCUMMVM_SVN_REVISION #define SCUMMVM_SVN_REVISION #endif diff --git a/base/internal_version.h.in b/base/internal_version.h.in index 4eecf90d87..adf5f94d21 100644 --- a/base/internal_version.h.in +++ b/base/internal_version.h.in @@ -1,3 +1,7 @@ +#ifndef INCLUDED_FROM_BASE_VERSION_CPP +#error This file may only be included by base/version.cpp +#endif + #ifndef SCUMMVM_SVN_REVISION #define SCUMMVM_SVN_REVISION #endif diff --git a/base/plugins.cpp b/base/plugins.cpp index c0ff6f6dfa..b14783abee 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -115,6 +115,9 @@ public: #if PLUGIN_ENABLED_STATIC(GROOVIE) LINK_PLUGIN(GROOVIE) #endif + #if PLUGIN_ENABLED_STATIC(HUGO) + LINK_PLUGIN(HUGO) + #endif #if PLUGIN_ENABLED_STATIC(KYRA) LINK_PLUGIN(KYRA) #endif @@ -200,6 +203,11 @@ public: LINK_PLUGIN(ADLIB) LINK_PLUGIN(PCSPK) LINK_PLUGIN(PCJR) + #ifndef DISABLE_SID + LINK_PLUGIN(C64) + #endif + LINK_PLUGIN(AMIGA) + LINK_PLUGIN(APPLEIIGS) LINK_PLUGIN(TOWNS) #if defined (UNIX) LINK_PLUGIN(TIMIDITY) diff --git a/base/version.cpp b/base/version.cpp index 17058d4a03..055067a656 100644 --- a/base/version.cpp +++ b/base/version.cpp @@ -24,9 +24,11 @@ */ #include "common/scummsys.h" -#include "base/internal_version.h" #include "base/version.h" +#define INCLUDED_FROM_BASE_VERSION_CPP +#include "base/internal_version.h" + /* * Version string and build date string. These can be used by anything that * wants to display this information to the user (e.g. about dialog). |