Skip to content

Commit

Permalink
CREATE_PROJECT: Disable engines for which required features are not a…
Browse files Browse the repository at this point in the history
…vailable
  • Loading branch information
criezy committed Feb 6, 2017
1 parent 14dcdb6 commit 2f4d14a
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 2 deletions.
23 changes: 21 additions & 2 deletions devtools/create_project/create_project.cpp
Expand Up @@ -300,6 +300,19 @@ int main(int argc, char *argv[]) {
for (EngineDescList::iterator j = setup.engines.begin(); j != setup.engines.end(); ++j)
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
cout << "Enabled engines:\n\n";
Expand Down Expand Up @@ -906,7 +919,7 @@ namespace {
*/
bool parseEngine(const std::string &line, EngineDesc &engine) {
// 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);

if (tokens.size() < 4)
Expand All @@ -921,8 +934,14 @@ bool parseEngine(const std::string &line, EngineDesc &engine) {
engine.name = *token; ++token;
engine.desc = *token; ++token;
engine.enable = (*token == "yes"); ++token;
if (token != tokens.end())
if (token != tokens.end()) {
engine.subEngines = tokenize(*token);
++token;
if (token != tokens.end())
++token;
if (token != tokens.end())
engine.requiredFeatures = tokenize(*token);
}

return true;
}
Expand Down
5 changes: 5 additions & 0 deletions devtools/create_project/create_project.h
Expand Up @@ -86,6 +86,11 @@ struct EngineDesc {
* Whether the engine should be included in the build or not.
*/
bool enable;

/**
* Features required for this engine.
*/
StringList requiredFeatures;

/**
* A list of all available sub engine names. Sub engines are engines
Expand Down

0 comments on commit 2f4d14a

Please sign in to comment.