diff options
Diffstat (limited to 'base/plugins.h')
| -rw-r--r-- | base/plugins.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/base/plugins.h b/base/plugins.h index d03a240922..2eaa290ed7 100644 --- a/base/plugins.h +++ b/base/plugins.h @@ -63,6 +63,7 @@ enum PluginType { PLUGIN_TYPE_ENGINE = 0, PLUGIN_TYPE_MIDI, + /* PLUGIN_TYPE_SCALER, */ // TODO: Add graphics scaler plugins PLUGIN_TYPE_MAX }; @@ -81,16 +82,10 @@ extern int pluginTypeVersions[PLUGIN_TYPE_MAX]; #define DYNAMIC_PLUGIN 2 #define PLUGIN_ENABLED_STATIC(ID) \ - (defined(ENABLE_##ID) && !PLUGIN_ENABLED_DYNAMIC(ID)) - -// HACK for MSVC -#if defined(_MSC_VER) - #undef PLUGIN_ENABLED_STATIC - #define PLUGIN_ENABLED_STATIC(ID) 1 -#endif + (defined( ENABLE_##ID ) && !PLUGIN_ENABLED_DYNAMIC(ID)) #define PLUGIN_ENABLED_DYNAMIC(ID) \ - (defined(ENABLE_##ID) && (ENABLE_##ID == DYNAMIC_PLUGIN) && defined(DYNAMIC_MODULES)) + (defined( ENABLE_##ID ) && (ENABLE_##ID == DYNAMIC_PLUGIN) && defined(DYNAMIC_MODULES)) /** * REGISTER_PLUGIN_STATIC is a convenience macro which is used to declare @@ -192,7 +187,7 @@ public: return (PO_t *)_pluginObject; } - typedef Common::Array<PluginSubclass *> list; + typedef Common::Array<PluginSubclass *> List; }; /** @@ -245,7 +240,7 @@ protected: * @param filename the name of the loadable code module * @return a pointer to a Plugin instance, or 0 if an error occurred. */ - virtual Plugin* createPlugin(const Common::String &filename) const = 0; + virtual Plugin *createPlugin(const Common::String &filename) const = 0; /** * Check if the supplied filename corresponds to a loadable plugin file in |