aboutsummaryrefslogtreecommitdiff
path: root/engines/mohawk/detection.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2019-10-05 19:04:58 +0200
committerEugene Sandulenko2019-10-05 19:07:50 +0200
commited98a96e87a7e3186e295d7f3faa9984be2497a0 (patch)
tree38b59aa10608d60787075e08b4c816e39ded6a25 /engines/mohawk/detection.cpp
parenta69be0720bf4753a16da0affad178b3aec762cdd (diff)
downloadscummvm-rg350-ed98a96e87a7e3186e295d7f3faa9984be2497a0.tar.gz
scummvm-rg350-ed98a96e87a7e3186e295d7f3faa9984be2497a0.tar.bz2
scummvm-rg350-ed98a96e87a7e3186e295d7f3faa9984be2497a0.zip
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
Diffstat (limited to 'engines/mohawk/detection.cpp')
-rw-r--r--engines/mohawk/detection.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp
index e81fc56199..075e7d233e 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