[Scummvm-git-logs] scummvm master -> 751a1ce28c1c8fcc1d39411ff1f468a0b894e329

[ccawley2011]

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

Summary:
751a1ce28c GLK: Include Comprehend and Glulxe in release builds


Commit: 751a1ce28c1c8fcc1d39411ff1f468a0b894e329
    https://github.com/scummvm/scummvm/commit/751a1ce28c1c8fcc1d39411ff1f468a0b894e329
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-08-22T13:34:06+01:00

Commit Message:
GLK: Include Comprehend and Glulxe in release builds

Changed paths:
    engines/glk/detection.cpp
    engines/glk/metaengine.cpp


diff --git a/engines/glk/detection.cpp b/engines/glk/detection.cpp
index ffc9e2d016..a851107f07 100644
--- a/engines/glk/detection.cpp
+++ b/engines/glk/detection.cpp
@@ -38,6 +38,7 @@
 #include "glk/alan2/detection.h"
 #include "glk/alan3/detection.h"
 #include "glk/archetype/detection.h"
+#include "glk/comprehend/detection.h"
 #include "glk/glulx/detection.h"
 #include "glk/hugo/detection.h"
 #include "glk/jacl/detection.h"
@@ -48,7 +49,6 @@
 #include "glk/zcode/detection.h"
 
 #ifndef RELEASE_BUILD
-#include "glk/comprehend/detection.h"
 #include "glk/tads/detection.h"
 #endif
 
@@ -132,6 +132,7 @@ PlainGameList GlkMetaEngineDetection::getSupportedGames() const {
 	Glk::Alan2::Alan2MetaEngine::getSupportedGames(list);
 	Glk::Alan3::Alan3MetaEngine::getSupportedGames(list);
 	Glk::Archetype::ArchetypeMetaEngine::getSupportedGames(list);
+	Glk::Comprehend::ComprehendMetaEngine::getSupportedGames(list);
 	Glk::Glulx::GlulxMetaEngine::getSupportedGames(list);
 	Glk::Hugo::HugoMetaEngine::getSupportedGames(list);
 	Glk::JACL::JACLMetaEngine::getSupportedGames(list);
@@ -141,7 +142,6 @@ PlainGameList GlkMetaEngineDetection::getSupportedGames() const {
 	Glk::Scott::ScottMetaEngine::getSupportedGames(list);
 	Glk::ZCode::ZCodeMetaEngine::getSupportedGames(list);
 #ifndef RELEASE_BUILD
-	Glk::Comprehend::ComprehendMetaEngine::getSupportedGames(list);
 	Glk::TADS::TADSMetaEngine::getSupportedGames(list);
 #endif
 
@@ -163,6 +163,7 @@ PlainGameDescriptor GlkMetaEngineDetection::findGame(const char *gameId) const {
 	FIND_GAME(AGT);
 	FIND_GAME(Alan3);
 	FIND_GAME(Archetype);
+	FIND_GAME(Comprehend);
 	FIND_GAME(Glulx);
 	FIND_GAME(Hugo);
 	FIND_GAME(JACL);
@@ -172,7 +173,6 @@ PlainGameDescriptor GlkMetaEngineDetection::findGame(const char *gameId) const {
 	FIND_GAME(Scott);
 	FIND_GAME(ZCode);
 #ifndef RELEASE_BUILD
-	FIND_GAME(Comprehend);
 	FIND_GAME(TADS);
 #endif
 
@@ -194,6 +194,7 @@ DetectedGames GlkMetaEngineDetection::detectGames(const Common::FSList &fslist)
 	Glk::Alan2::Alan2MetaEngine::detectGames(fslist, detectedGames);
 	Glk::Alan3::Alan3MetaEngine::detectGames(fslist, detectedGames);
 	Glk::Archetype::ArchetypeMetaEngine::detectGames(fslist, detectedGames);
+	Glk::Comprehend::ComprehendMetaEngine::detectGames(fslist, detectedGames);
 	Glk::Glulx::GlulxMetaEngine::detectGames(fslist, detectedGames);
 	Glk::Hugo::HugoMetaEngine::detectGames(fslist, detectedGames);
 	Glk::JACL::JACLMetaEngine::detectGames(fslist, detectedGames);
@@ -203,7 +204,6 @@ DetectedGames GlkMetaEngineDetection::detectGames(const Common::FSList &fslist)
 	Glk::Scott::ScottMetaEngine::detectGames(fslist, detectedGames);
 	Glk::ZCode::ZCodeMetaEngine::detectGames(fslist, detectedGames);
 #ifndef RELEASE_BUILD
-	Glk::Comprehend::ComprehendMetaEngine::detectGames(fslist, detectedGames);
 	Glk::TADS::TADSMetaEngine::detectGames(fslist, detectedGames);
 #endif
 
@@ -218,6 +218,7 @@ void GlkMetaEngineDetection::detectClashes() const {
 	Glk::Alan2::Alan2MetaEngine::detectClashes(map);
 	Glk::Alan3::Alan3MetaEngine::detectClashes(map);
 	Glk::Archetype::ArchetypeMetaEngine::detectClashes(map);
+	Glk::Comprehend::ComprehendMetaEngine::detectClashes(map);
 	Glk::Glulx::GlulxMetaEngine::detectClashes(map);
 	Glk::Hugo::HugoMetaEngine::detectClashes(map);
 	Glk::JACL::JACLMetaEngine::detectClashes(map);
@@ -227,7 +228,6 @@ void GlkMetaEngineDetection::detectClashes() const {
 	Glk::Scott::ScottMetaEngine::detectClashes(map);
 	Glk::ZCode::ZCodeMetaEngine::detectClashes(map);
 #ifndef RELEASE_BUILD
-	Glk::Comprehend::ComprehendMetaEngine::detectClashes(map);
 	Glk::TADS::TADSMetaEngine::detectClashes(map);
 #endif
 }
diff --git a/engines/glk/metaengine.cpp b/engines/glk/metaengine.cpp
index b6b777c85a..68ced61e9c 100644
--- a/engines/glk/metaengine.cpp
+++ b/engines/glk/metaengine.cpp
@@ -35,8 +35,12 @@
 #include "glk/alan3/alan3.h"
 #include "glk/archetype/archetype.h"
 #include "glk/archetype/detection.h"
+#include "glk/comprehend/comprehend.h"
+#include "glk/comprehend/detection.h"
 #include "glk/zcode/detection.h"
 #include "glk/zcode/zcode.h"
+#include "glk/glulx/detection.h"
+#include "glk/glulx/glulx.h"
 #include "glk/hugo/detection.h"
 #include "glk/hugo/hugo.h"
 #include "glk/jacl/detection.h"
@@ -51,10 +55,6 @@
 #include "glk/scott/scott.h"
 
 #ifndef RELEASE_BUILD
-#include "glk/comprehend/comprehend.h"
-#include "glk/comprehend/detection.h"
-#include "glk/glulx/detection.h"
-#include "glk/glulx/glulx.h"
 #include "glk/tads/detection.h"
 #include "glk/tads/tads2/tads2.h"
 #include "glk/tads/tads3/tads3.h"
@@ -204,6 +204,8 @@ Common::Error GlkMetaEngine::createInstance(OSystem *syst, Engine **engine) cons
 	else if ((create<Glk::Alan2::Alan2MetaEngine, Glk::Alan2::Alan2>(syst, gameDesc, *engine))) {}
 	else if ((create<Glk::Alan3::Alan3MetaEngine, Glk::Alan3::Alan3>(syst, gameDesc, *engine))) {}
 	else if ((create<Glk::Archetype::ArchetypeMetaEngine, Glk::Archetype::Archetype>(syst, gameDesc, *engine))) {}
+	else if ((create<Glk::Comprehend::ComprehendMetaEngine, Glk::Comprehend::Comprehend>(syst, gameDesc, *engine))) {}
+	else if ((create<Glk::Glulx::GlulxMetaEngine, Glk::Glulx::Glulx>(syst, gameDesc, *engine))) {}
 	else if ((create<Glk::Hugo::HugoMetaEngine, Glk::Hugo::Hugo>(syst, gameDesc, *engine))) {}
 	else if ((create<Glk::JACL::JACLMetaEngine, Glk::JACL::JACL>(syst, gameDesc, *engine))) {}
 	else if ((create<Glk::Level9::Level9MetaEngine, Glk::Level9::Level9>(syst, gameDesc, *engine))) {}
@@ -212,8 +214,6 @@ Common::Error GlkMetaEngine::createInstance(OSystem *syst, Engine **engine) cons
 	else if ((create<Glk::Scott::ScottMetaEngine, Glk::Scott::Scott>(syst, gameDesc, *engine))) {}
 	else if ((create<Glk::ZCode::ZCodeMetaEngine, Glk::ZCode::ZCode>(syst, gameDesc, *engine))) {}
 #ifndef RELEASE_BUILD
-	else if ((create<Glk::Comprehend::ComprehendMetaEngine, Glk::Comprehend::Comprehend>(syst, gameDesc, *engine))) {}
-	else if ((create<Glk::Glulx::GlulxMetaEngine, Glk::Glulx::Glulx>(syst, gameDesc, *engine))) {}
 	else if ((td = Glk::TADS::TADSMetaEngine::findGame(gameDesc._gameId.c_str()))._description) {
 		if (!isGameAllowed(td._supportLevel))
 			return Common::kUserCanceled;