diff options
| author | Christopher Page | 2008-06-02 21:36:45 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-06-02 21:36:45 +0000 |
| commit | 0cbfc3a9d1b30822373360aa4c398518c9a74990 (patch) | |
| tree | 24c865ed3153978aa00df03613b1bdde1a6efe5d /base | |
| parent | a338d5fdb2715a7b29ae789c632a0cfa05803079 (diff) | |
| parent | 6f09c5a9286f97a1fac6e85fa4092295bc779440 (diff) | |
| download | scummvm-rg350-0cbfc3a9d1b30822373360aa4c398518c9a74990.tar.gz scummvm-rg350-0cbfc3a9d1b30822373360aa4c398518c9a74990.tar.bz2 scummvm-rg350-0cbfc3a9d1b30822373360aa4c398518c9a74990.zip | |
Merged revisions 32348-32349,32351-32356,32358-32411,32413-32441,32443-32445,32449,32453-32454,32456-32457,32459-32462,32464-32465,32467-32492,32494-32503 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
svn-id: r32505
Diffstat (limited to 'base')
| -rw-r--r-- | base/plugins.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/base/plugins.h b/base/plugins.h index 2eaa290ed7..aef95a6650 100644 --- a/base/plugins.h +++ b/base/plugins.h @@ -81,6 +81,12 @@ extern int pluginTypeVersions[PLUGIN_TYPE_MAX]; #define STATIC_PLUGIN 1 #define DYNAMIC_PLUGIN 2 +// Note: The spaces around ENABLE_##ID have been added on purpose for +// MSVC. For some reason, MSVC tries to add the parenthesis after +// ENABLE_##ID to the check, thus making it false all the time. +// Please do NOT remove them, otherwise no engine plugins will be +// registered under MSVC + #define PLUGIN_ENABLED_STATIC(ID) \ (defined( ENABLE_##ID ) && !PLUGIN_ENABLED_DYNAMIC(ID)) |