[Scummvm-git-logs] scummvm master -> 45abc110922d700b8b1b50be2ba676183178a00c

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
684f8de589 MOHAWK: Fix build when the Riven subengine is not enabled
45abc11092 KYRA: Fix build when either the LoL or the EoB subengines are disabled


Commit: 684f8de58984e8bdbf8e119406e63d89f73e01cf
    https://github.com/scummvm/scummvm/commit/684f8de58984e8bdbf8e119406e63d89f73e01cf
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2020-01-27T01:26:35+02:00

Commit Message:
MOHAWK: Fix build when the Riven subengine is not enabled

Changed paths:
    engines/mohawk/detection.cpp


diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp
index 8f628cb..c3c4e11 100644
--- a/engines/mohawk/detection.cpp
+++ b/engines/mohawk/detection.cpp
@@ -334,9 +334,11 @@ SaveStateDescriptor MohawkMetaEngine::querySaveMetaInfos(const char *target, int
 Common::Keymap *MohawkMetaEngine::initKeymap(const char *target) const {
 	Common::String gameId = ConfMan.get("gameid", target);
 
+#ifdef ENABLE_RIVEN
 	if (gameId == "riven") {
 		return Mohawk::MohawkEngine_Riven::initKeymap(target);
 	}
+#endif
 
 	return AdvancedMetaEngine::initKeymap(target);
 }


Commit: 45abc110922d700b8b1b50be2ba676183178a00c
    https://github.com/scummvm/scummvm/commit/45abc110922d700b8b1b50be2ba676183178a00c
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2020-01-27T01:28:19+02:00

Commit Message:
KYRA: Fix build when either the LoL or the EoB subengines are disabled

Changed paths:
    engines/kyra/detection.cpp


diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index 5770489..d0594b9 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -355,13 +355,17 @@ SaveStateDescriptor KyraMetaEngine::querySaveMetaInfos(const char *target, int s
 Common::Keymap *KyraMetaEngine::initKeymap(const char *target) const {
 	Common::String gameId = ConfMan.get("gameid", target);
 
+#ifdef ENABLE_LOL
 	if (gameId.contains("lol")) {
 		return Kyra::LoLEngine::initKeymap();
 	}
+#endif
 
+#ifdef ENABLE_EOB
 	if (gameId.contains("eob")) {
 		return Kyra::EoBCoreEngine::initKeymap(gameId);
 	}
+#endif
 
 	return AdvancedMetaEngine::initKeymap(target);
 }