aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Kiehl2003-10-20 22:02:10 +0000
committerOliver Kiehl2003-10-20 22:02:10 +0000
commit58dffdb02742138d57f5288dd7b3ebdedd6d03b1 (patch)
treedd93868f7d23a94096fce35daa9c0b5c4f911e60
parentff5fde47ea11fb03007fc3a1f597d3202d5cd25e (diff)
downloadscummvm-rg350-58dffdb02742138d57f5288dd7b3ebdedd6d03b1.tar.gz
scummvm-rg350-58dffdb02742138d57f5288dd7b3ebdedd6d03b1.tar.bz2
scummvm-rg350-58dffdb02742138d57f5288dd7b3ebdedd6d03b1.zip
fix compile when using dynamic plugin support
svn-id: r10920
-rw-r--r--base/plugins.cpp7
-rw-r--r--base/plugins.h2
2 files changed, 5 insertions, 4 deletions
diff --git a/base/plugins.cpp b/base/plugins.cpp
index d64593d952..0a00ddd891 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -72,9 +72,10 @@ GameSettings Plugin::findGame(const char *gameName) const {
* 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 @@ class DynamicPlugin : public GameSettingsPlugin {
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 @@ void PluginManager::loadPlugins() {
// 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
diff --git a/base/plugins.h b/base/plugins.h
index 32946774e6..038c8a774c 100644
--- a/base/plugins.h
+++ b/base/plugins.h
@@ -75,7 +75,7 @@ public:
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