[Scummvm-cvs-logs] CVS: scummvm/base plugins.cpp,1.15,1.16 plugins.h,1.11,1.12
Oliver Kiehl
olki at users.sourceforge.net
Mon Oct 20 15:04:26 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen defs.h,1.9,1.10 queen.cpp,1.19,1.20 resource.cpp,1.16,1.17 resource.h,1.14,1.15
- Next message: [Scummvm-cvs-logs] CVS: scummvm README,1.189,1.190
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1:/tmp/cvs-serv9111
Modified Files:
plugins.cpp plugins.h
Log Message:
fix compile when using dynamic plugin support
Index: plugins.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/plugins.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- plugins.cpp 17 Oct 2003 23:16:52 -0000 1.15
+++ plugins.cpp 20 Oct 2003 22:02:09 -0000 1.16
@@ -72,9 +72,10 @@
* the transition is complete.
*/
class GameSettingsPlugin : public Plugin {
-private:
+protected:
GameList _games;
public:
+ GameSettingsPlugin() { }
GameSettingsPlugin(GameList games) : _games(games) { }
GameList getSupportedGames() const { return _games; }
};
@@ -120,7 +121,7 @@
public:
DynamicPlugin(const char *filename)
- : GameSettingsPlugin(0), _dlHandle(0), _filename(filename), _ef(0), _df(0) {}
+ : GameSettingsPlugin(), _dlHandle(0), _filename(filename), _ef(0), _df(0) {}
const char *getName() const { return _name.c_str(); }
@@ -234,7 +235,7 @@
// Hence one more symbol should be exported by plugins which returns
// the "ABI" version the plugin was built for, and we can compare that
// to the ABI version of the executable.
- #define LOAD_MODULE(name, NAME)
+ #define LOAD_MODULE(name, NAME) \
tryLoadPlugin(new DynamicPlugin("scumm/lib" name ".so"));
#else
// "Loader" for the static plugins
Index: plugins.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/plugins.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- plugins.h 17 Oct 2003 23:16:52 -0000 1.11
+++ plugins.h 20 Oct 2003 22:02:10 -0000 1.12
@@ -75,7 +75,7 @@
const char *PLUGIN_name() { return name; } \
GameList PLUGIN_getSupportedGames() { return gameListFactory(); } \
Engine *PLUGIN_createEngine(GameDetector *detector, OSystem *syst) { return engineFactory(detector, syst); } \
- GameList PLUGIN_detectGames(const FSList &fslist) { return detectGames(fslist); }
+ GameList PLUGIN_detectGames(const FSList &fslist) { return detectGames(fslist); } \
}
#endif
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen defs.h,1.9,1.10 queen.cpp,1.19,1.20 resource.cpp,1.16,1.17 resource.h,1.14,1.15
- Next message: [Scummvm-cvs-logs] CVS: scummvm README,1.189,1.190
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list