thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed an MSVC specific hack, after discussing with jvprat. It seems that MSVC was trying to add the parenthesis after ENABLE_##ID to the check...

Browse source 
svn-id: r32347
This commit is contained in:
Filippos Karapetis 2008-05-28 19:45:04 +00:00
parent 649f439fb6
commit 057af1000f
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
base/plugins.h
View file

@ -82,16 +82,10 @@ extern int pluginTypeVersions[PLUGIN_TYPE_MAX];
#define DYNAMIC_PLUGIN 2 #define DYNAMIC_PLUGIN 2
#define PLUGIN_ENABLED_STATIC(ID) \ #define PLUGIN_ENABLED_STATIC(ID) \
(defined(ENABLE_##ID) && !PLUGIN_ENABLED_DYNAMIC(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
#define 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 * REGISTER_PLUGIN_STATIC is a convenience macro which is used to declare