thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CREATE_PROJECT: Disable engines for which required features are not available

Browse source
This commit is contained in:
Thierry Crozat 2017-02-06 23:18:02 +00:00
parent 14dcdb6103
commit 2f4d14aba5
2 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
devtools/create_project/create_project.cpp
View file

@ -300,6 +300,19 @@ int main(int argc, char *argv[]) {
for (EngineDescList::iterator j = setup.engines.begin(); j != setup.engines.end(); ++j) for (EngineDescList::iterator j = setup.engines.begin(); j != setup.engines.end(); ++j)
j->enable = false; j->enable = false;
} }
// Disable engines for which we are missing dependencies
for (EngineDescList::const_iterator i = setup.engines.begin(); i != setup.engines.end(); ++i) {
if (i->enable) {
for (StringList::const_iterator ef = i->requiredFeatures.begin(); ef != i->requiredFeatures.end(); ++ef) {
FeatureList::iterator feature = std::find(setup.features.begin(), setup.features.end(), *ef);
if (feature != setup.features.end() && !feature->enable) {
setEngineBuildState(i->name, setup.engines, false);
break;
}
}
}
}
// Print status // Print status
cout << "Enabled engines:\n\n"; cout << "Enabled engines:\n\n";
@ -906,7 +919,7 @@ namespace {
*/ */
bool parseEngine(const std::string &line, EngineDesc &engine) { bool parseEngine(const std::string &line, EngineDesc &engine) {
// Format: // Format:
// add_engine engine_name "Readable Description" enable_default ["SubEngineList"] // add_engine engine_name "Readable Description" enable_default ["SubEngineList"] ["base games"] ["dependencies"]
TokenList tokens = tokenize(line); TokenList tokens = tokenize(line);
if (tokens.size() < 4) if (tokens.size() < 4)
@ -921,8 +934,14 @@ bool parseEngine(const std::string &line, EngineDesc &engine) {
engine.name = *token; ++token; engine.name = *token; ++token;
engine.desc = *token; ++token; engine.desc = *token; ++token;
engine.enable = (*token == "yes"); ++token; engine.enable = (*token == "yes"); ++token;
if (token != tokens.end()) if (token != tokens.end()) {
engine.subEngines = tokenize(*token); engine.subEngines = tokenize(*token);
++token;
if (token != tokens.end())
++token;
if (token != tokens.end())
engine.requiredFeatures = tokenize(*token);
}
return true; return true;
} }

5
devtools/create_project/create_project.h
View file

@ -86,6 +86,11 @@ struct EngineDesc {
* Whether the engine should be included in the build or not. * Whether the engine should be included in the build or not.
*/ */
bool enable; bool enable;
/**
* Features required for this engine.
*/
StringList requiredFeatures;
/** /**
* A list of all available sub engine names. Sub engines are engines * A list of all available sub engine names. Sub engines are engines