[Scummvm-git-logs] scummvm master -> ed98a96e87a7e3186e295d7f3faa9984be2497a0

[sev-]

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:
ed98a96e87 MOHAWK: Add Myst ME as a subengine, and mark 'jpeg' as a required dependency


Commit: ed98a96e87a7e3186e295d7f3faa9984be2497a0
    https://github.com/scummvm/scummvm/commit/ed98a96e87a7e3186e295d7f3faa9984be2497a0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-10-05T19:07:50+02:00

Commit Message:
MOHAWK: Add Myst ME as a subengine, and mark 'jpeg' as a required dependency

Because our build system does not allow recursive dependencies, inserting
#error for incorrect configuration. For enabling mystme, myst target must
be enabled as well

Changed paths:
    engines/mohawk/configure.engine
    engines/mohawk/detection.cpp


diff --git a/engines/mohawk/configure.engine b/engines/mohawk/configure.engine
index ac2c59f..c5d0a4c 100644
--- a/engines/mohawk/configure.engine
+++ b/engines/mohawk/configure.engine
@@ -1,6 +1,7 @@
 # This file is included from the main "configure" script
 # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
-add_engine mohawk "Mohawk" yes "cstime myst riven" "Living Books" "highres"
+add_engine mohawk "Mohawk" yes "cstime myst mystme riven" "Living Books" "highres"
 add_engine cstime "Where in Time is Carmen Sandiego?" no
 add_engine riven "Riven: The Sequel to Myst" yes "" "" "16bit"
 add_engine myst "Myst" yes
+add_engine mystme "Myst ME" yes "" "" "jpeg"
diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp
index e81fc56..075e7d2 100644
--- a/engines/mohawk/detection.cpp
+++ b/engines/mohawk/detection.cpp
@@ -39,6 +39,12 @@
 #include "mohawk/myst_state.h"
 #endif
 
+#ifdef ENABLE_MYSTME
+#ifndef ENABLE_MYST
+#error "Myst must be enabled for building Myst ME. Specify --enable-engine=myst,mystme"
+#endif
+#endif
+
 #ifdef ENABLE_RIVEN
 #include "mohawk/riven.h"
 #include "mohawk/riven_saveload.h"
@@ -322,6 +328,12 @@ bool MohawkMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGa
 		case Mohawk::GType_MYST:
 		case Mohawk::GType_MAKINGOF:
 #ifdef ENABLE_MYST
+#ifndef ENABLE_MYSTME
+			if (gd->features & Mohawk::GF_ME) {
+				warning("Myst ME support not compiled in");
+				return false;
+			}
+#endif
 			*engine = new Mohawk::MohawkEngine_Myst(syst, gd);
 			break;
 #else