mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-30 23:43:10 +00:00
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
This commit is contained in:
parent
ec02171268
commit
4ab211f673
2
Makefile
2
Makefile
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user