libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 17:29:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ALL: Fixed compilation after sync with ScummVM

Browse Source
This commit is contained in:
Pawel Kolodziejski 2020-10-05 00:43:24 +02:00
parent d15f78d502
commit 5c57ef54ad
9 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/detection.cpp
View File

@ -24,7 +24,7 @@
#include "base/plugins.h"
#include "engines/metaengine.h"
#include "engines/advanceddetector.h"
#include "engines/advancedDetector.h"
#include "engines/detection.h"

14
engines/grim/metaengine.cpp
View File

@ -33,11 +33,11 @@ namespace Grim {
class GrimMetaEngine : public AdvancedMetaEngine {
public:
const char *getName() const override {
return "Grim";
}
const char *getName() const override {
return "Grim";
}
Common::Error createInstance(OSystem *syst, Engine **engine) const override {
Common::Error createInstance(OSystem *syst, Engine **engine) const override {
Engines::upgradeTargetIfNecessary(obsoleteGameIDsTable);
return AdvancedMetaEngine::createInstance(syst, engine);
}
@ -70,12 +70,6 @@ bool GrimMetaEngine::hasFeature(MetaEngineFeature f) const {
(f == kSupportsLoadingDuringStartup);
}
bool GrimMetaEngine::hasFeature(MetaEngineFeature f) const {
return
(f == kSupportsListSaves) ||
(f == kSupportsLoadingDuringStartup);
}
SaveStateList GrimMetaEngine::listSaves(const char *target) const {
Common::String gameId = ConfMan.get("gameid", target);
Common::Platform platform = Common::parsePlatform(ConfMan.get("platform", target));

1
engines/grim/module.mk
View File

@ -115,6 +115,7 @@ MODULE_OBJS := \
lua_v1_set.o \
lua_v1_sound.o \
lua_v1_text.o \
metaengine.o \
material.o \
model.o \
objectstate.o \

4
engines/icb/metaengine.cpp
View File

@ -28,10 +28,10 @@ namespace ICB {
class IcbMetaEngine : public AdvancedMetaEngine {
public:
const char *getName() const override {
const char *getName() const override {
return "icb";
}
virtual bool hasFeature(MetaEngineFeature f) const override { return false; }
virtual bool hasFeature(MetaEngineFeature f) const override { return false; }
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
};

1
engines/icb/module.mk
View File

@ -66,6 +66,7 @@ MODULE_OBJS := \
map_marker.o \
map_marker_pc.o \
mega_interaction.o \
metaengine.o \
mission.o \
mission_functions.o \
mouse.o \

4
engines/myst3/metaengine.cpp
View File

@ -35,11 +35,11 @@ namespace Myst3{
class Myst3MetaEngine : public AdvancedMetaEngine {
public:
const char *getName() const override {
const char *getName() const override {
return "myst3";
}
bool hasFeature(MetaEngineFeature f) const override {
bool hasFeature(MetaEngineFeature f) const override {
return
(f == kSupportsListSaves) ||
(f == kSupportsDeleteSave) ||

1
engines/myst3/module.mk
View File

@ -17,6 +17,7 @@ MODULE_OBJS := \
hotspot.o \
inventory.o \
menu.o \
metaengine.o \
movie.o \
myst3.o \
node.o \

4
engines/stark/metaengine.cpp
View File

@ -32,11 +32,11 @@ namespace Stark {
class StarkMetaEngine : public AdvancedMetaEngine {
public:
const char *getName() const override {
const char *getName() const override {
return "stark";
}
bool hasFeature(MetaEngineFeature f) const override {
bool hasFeature(MetaEngineFeature f) const override {
return
(f == kSupportsListSaves) ||
(f == kSupportsLoadingDuringStartup) ||

1
engines/stark/module.mk
View File

@ -22,6 +22,7 @@ MODULE_OBJS := \
formats/xarc.o \
formats/xmg.o \
formats/xrc.o \
metaengine.o \
model/animhandler.o \
model/model.o \
model/skeleton_anim.o \