[Scummvm-cvs-logs] SF.net SVN: scummvm: [21689] scummvm/trunk/base
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sat Apr 8 05:07:12 CEST 2006
Revision: 21689
Author: fingolfin
Date: 2006-04-08 05:06:07 -0700 (Sat, 08 Apr 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21689&view=rev
Log Message:
-----------
Modified the REGISTER_PLUGIN macro so that it allows (and requires) a trailing semicolon (this helps certain tools to parse our code better)
Modified Paths:
--------------
scummvm/trunk/base/plugins.h
scummvm/trunk/engines/cine/cine.cpp
scummvm/trunk/engines/gob/gob.cpp
scummvm/trunk/engines/kyra/kyra.cpp
scummvm/trunk/engines/lure/lure.cpp
scummvm/trunk/engines/queen/queen.cpp
scummvm/trunk/engines/saga/game.cpp
scummvm/trunk/engines/scumm/plugin.cpp
scummvm/trunk/engines/simon/game.cpp
scummvm/trunk/engines/sky/sky.cpp
scummvm/trunk/engines/sword1/sword1.cpp
scummvm/trunk/engines/sword2/sword2.cpp
Modified: scummvm/trunk/base/plugins.h
===================================================================
--- scummvm/trunk/base/plugins.h 2006-04-08 11:38:41 UTC (rev 21688)
+++ scummvm/trunk/base/plugins.h 2006-04-08 12:06:07 UTC (rev 21689)
@@ -123,7 +123,8 @@
Engine_##ID##_create, \
Engine_##ID##_detectGames \
);\
- }
+ } \
+ void dummyFuncToAllowTrailingSemicolon()
#else
#define REGISTER_PLUGIN(ID,name) \
extern "C" { \
@@ -132,7 +133,8 @@
PLUGIN_EXPORT GameDescriptor PLUGIN_findGameID(const char *gameid) { return Engine_##ID##_findGameID(gameid); } \
PLUGIN_EXPORT Engine *PLUGIN_createEngine(GameDetector *detector, OSystem *syst) { return Engine_##ID##_create(detector, syst); } \
PLUGIN_EXPORT DetectedGameList PLUGIN_detectGames(const FSList &fslist) { return Engine_##ID##_detectGames(fslist); } \
- }
+ } \
+ void dummyFuncToAllowTrailingSemicolon()
#endif
#ifndef DYNAMIC_MODULES
Modified: scummvm/trunk/engines/cine/cine.cpp
===================================================================
--- scummvm/trunk/engines/cine/cine.cpp 2006-04-08 11:38:41 UTC (rev 21688)
+++ scummvm/trunk/engines/cine/cine.cpp 2006-04-08 12:06:07 UTC (rev 21689)
@@ -120,7 +120,7 @@
return new Cine::CineEngine(detector, syst);
}
-REGISTER_PLUGIN(CINE, "CINE Engine")
+REGISTER_PLUGIN(CINE, "CINE Engine");
namespace Cine {
Modified: scummvm/trunk/engines/gob/gob.cpp
===================================================================
--- scummvm/trunk/engines/gob/gob.cpp 2006-04-08 11:38:41 UTC (rev 21688)
+++ scummvm/trunk/engines/gob/gob.cpp 2006-04-08 12:06:07 UTC (rev 21689)
@@ -387,4 +387,4 @@
return new GobEngine(detector, syst, features);
}
-REGISTER_PLUGIN(GOB, "Gob Engine")
+REGISTER_PLUGIN(GOB, "Gob Engine");
Modified: scummvm/trunk/engines/kyra/kyra.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra.cpp 2006-04-08 11:38:41 UTC (rev 21688)
+++ scummvm/trunk/engines/kyra/kyra.cpp 2006-04-08 12:06:07 UTC (rev 21689)
@@ -209,7 +209,7 @@
return new KyraEngine(detector, system);
}
-REGISTER_PLUGIN(KYRA, "Legend of Kyrandia Engine")
+REGISTER_PLUGIN(KYRA, "Legend of Kyrandia Engine");
namespace Kyra {
Modified: scummvm/trunk/engines/lure/lure.cpp
===================================================================
--- scummvm/trunk/engines/lure/lure.cpp 2006-04-08 11:38:41 UTC (rev 21688)
+++ scummvm/trunk/engines/lure/lure.cpp 2006-04-08 12:06:07 UTC (rev 21689)
@@ -159,7 +159,7 @@
return new LureEngine(system);
}
-REGISTER_PLUGIN(LURE, "Lure of the Temptress Engine")
+REGISTER_PLUGIN(LURE, "Lure of the Temptress Engine");
namespace Lure {
Modified: scummvm/trunk/engines/queen/queen.cpp
===================================================================
--- scummvm/trunk/engines/queen/queen.cpp 2006-04-08 11:38:41 UTC (rev 21688)
+++ scummvm/trunk/engines/queen/queen.cpp 2006-04-08 12:06:07 UTC (rev 21689)
@@ -133,7 +133,7 @@
return new Queen::QueenEngine(syst);
}
-REGISTER_PLUGIN(QUEEN, "Flight of the Amazon Queen")
+REGISTER_PLUGIN(QUEEN, "Flight of the Amazon Queen");
namespace Queen {
Modified: scummvm/trunk/engines/saga/game.cpp
===================================================================
--- scummvm/trunk/engines/saga/game.cpp 2006-04-08 11:38:41 UTC (rev 21688)
+++ scummvm/trunk/engines/saga/game.cpp 2006-04-08 12:06:07 UTC (rev 21689)
@@ -88,7 +88,7 @@
return new Saga::SagaEngine(detector, syst);
}
-REGISTER_PLUGIN(SAGA, "SAGA Engine")
+REGISTER_PLUGIN(SAGA, "SAGA Engine");
namespace Saga {
Modified: scummvm/trunk/engines/scumm/plugin.cpp
===================================================================
--- scummvm/trunk/engines/scumm/plugin.cpp 2006-04-08 11:38:41 UTC (rev 21688)
+++ scummvm/trunk/engines/scumm/plugin.cpp 2006-04-08 12:06:07 UTC (rev 21689)
@@ -1451,7 +1451,7 @@
return engine;
}
-REGISTER_PLUGIN(SCUMM, "Scumm Engine")
+REGISTER_PLUGIN(SCUMM, "Scumm Engine");
#ifdef PALMOS_68K
#include "scumm_globals.h"
Modified: scummvm/trunk/engines/simon/game.cpp
===================================================================
--- scummvm/trunk/engines/simon/game.cpp 2006-04-08 11:38:41 UTC (rev 21688)
+++ scummvm/trunk/engines/simon/game.cpp 2006-04-08 12:06:07 UTC (rev 21689)
@@ -133,7 +133,7 @@
return new Simon::SimonEngine(syst);
}
-REGISTER_PLUGIN(SIMON, "Simon the Sorcerer")
+REGISTER_PLUGIN(SIMON, "Simon the Sorcerer");
namespace Simon {
Modified: scummvm/trunk/engines/sky/sky.cpp
===================================================================
--- scummvm/trunk/engines/sky/sky.cpp 2006-04-08 11:38:41 UTC (rev 21688)
+++ scummvm/trunk/engines/sky/sky.cpp 2006-04-08 12:06:07 UTC (rev 21689)
@@ -115,7 +115,7 @@
return new Sky::SkyEngine(syst);
}
-REGISTER_PLUGIN(SKY, "Beneath a Steel Sky")
+REGISTER_PLUGIN(SKY, "Beneath a Steel Sky");
namespace Sky {
Modified: scummvm/trunk/engines/sword1/sword1.cpp
===================================================================
--- scummvm/trunk/engines/sword1/sword1.cpp 2006-04-08 11:38:41 UTC (rev 21688)
+++ scummvm/trunk/engines/sword1/sword1.cpp 2006-04-08 12:06:07 UTC (rev 21689)
@@ -121,7 +121,7 @@
return new SwordEngine(detector, syst);
}
-REGISTER_PLUGIN(SWORD1, "Broken Sword")
+REGISTER_PLUGIN(SWORD1, "Broken Sword");
namespace Sword1 {
Modified: scummvm/trunk/engines/sword2/sword2.cpp
===================================================================
--- scummvm/trunk/engines/sword2/sword2.cpp 2006-04-08 11:38:41 UTC (rev 21688)
+++ scummvm/trunk/engines/sword2/sword2.cpp 2006-04-08 12:06:07 UTC (rev 21689)
@@ -116,7 +116,7 @@
return new Sword2::Sword2Engine(detector, syst);
}
-REGISTER_PLUGIN(SWORD2, "Broken Sword 2")
+REGISTER_PLUGIN(SWORD2, "Broken Sword 2");
namespace Sword2 {
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