diff options
| author | Max Horn | 2008-07-19 21:42:31 +0000 |
|---|---|---|
| committer | Max Horn | 2008-07-19 21:42:31 +0000 |
| commit | 4ab211f6732afb445e8f0e579b9e07b7fbfaa644 (patch) | |
| tree | 3b1304ae1c70d74ad106c1b7b7f7907dc0239226 | |
| parent | ec02171268db13d069dd312cdd38ab281087366c (diff) | |
| download | scummvm-rg350-4ab211f6732afb445e8f0e579b9e07b7fbfaa644.tar.gz scummvm-rg350-4ab211f6732afb445e8f0e579b9e07b7fbfaa644.tar.bz2 scummvm-rg350-4ab211f6732afb445e8f0e579b9e07b7fbfaa644.zip | |
Removed -Wundef from the default list of compiler flags, and changed PLUGIN_ENABLED_DYNAMIC to not use 'defined()', thus avoiding compiler problems on e.g. BeOS
svn-id: r33114
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | base/plugins.h | 10 |
2 files changed, 3 insertions, 9 deletions
@@ -25,7 +25,7 @@ CXXFLAGS:= -Wall $(CXXFLAGS) CXXFLAGS+= -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -Wno-reorder # Enable even more warnings... CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wcast-align -CXXFLAGS+= -Wshadow -Wimplicit -Wundef -Wnon-virtual-dtor -Wwrite-strings +CXXFLAGS+= -Wshadow -Wimplicit -Wnon-virtual-dtor -Wwrite-strings # Disable RTTI and exceptions, and enabled checking of pointers returned by "new" CXXFLAGS+= -fno-rtti -fno-exceptions -fcheck-new diff --git a/base/plugins.h b/base/plugins.h index 9d3ce97c3b..02116f6433 100644 --- a/base/plugins.h +++ b/base/plugins.h @@ -81,17 +81,11 @@ 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)) + (ENABLE_##ID && !PLUGIN_ENABLED_DYNAMIC(ID)) #define PLUGIN_ENABLED_DYNAMIC(ID) \ - (defined( ENABLE_##ID ) && (ENABLE_##ID == DYNAMIC_PLUGIN) && defined(DYNAMIC_MODULES)) + (ENABLE_##ID && (ENABLE_##ID == DYNAMIC_PLUGIN) && DYNAMIC_MODULES) /** * REGISTER_PLUGIN_STATIC is a convenience macro which is used to declare |