libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-18 07:53:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix compile when using dynamic plugin support

Browse Source 
svn-id: r10920
This commit is contained in:
Oliver Kiehl 2003-10-20 22:02:10 +00:00
parent ff5fde47ea
commit 58dffdb027
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
base/plugins.cpp
View File

@ -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

2
base/plugins.h
View File

@ -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