[Scummvm-cvs-logs] SF.net SVN: scummvm:[33114] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sat Jul 19 23:43:40 CEST 2008
Revision: 33114
http://scummvm.svn.sourceforge.net/scummvm/?rev=33114&view=rev
Author: fingolfin
Date: 2008-07-19 21:42:31 +0000 (Sat, 19 Jul 2008)
Log Message:
-----------
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
Modified Paths:
--------------
scummvm/trunk/Makefile
scummvm/trunk/base/plugins.h
Modified: scummvm/trunk/Makefile
===================================================================
--- scummvm/trunk/Makefile 2008-07-19 19:12:49 UTC (rev 33113)
+++ scummvm/trunk/Makefile 2008-07-19 21:42:31 UTC (rev 33114)
@@ -25,7 +25,7 @@
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
Modified: scummvm/trunk/base/plugins.h
===================================================================
--- scummvm/trunk/base/plugins.h 2008-07-19 19:12:49 UTC (rev 33113)
+++ scummvm/trunk/base/plugins.h 2008-07-19 21:42:31 UTC (rev 33114)
@@ -81,17 +81,11 @@
#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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list