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

DEVTOOLS: Make create_project sort SCUMM as first engine.

Browse source 
This makes create_project output consistent with configure output again.
This commit is contained in:
Johannes Schickel 2013-11-07 12:58:35 +01:00 • committed by D G Turner
parent ffce805fb2
commit 80136c1e51
2 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
devtools/create_project/config.h
View file

@ -27,6 +27,7 @@
#define PROJECT_NAME "scummvm" // Used for folders, icons, resources and project/solution name
#define LIBS_DEFINE "SCUMMVM_LIBS" // Name of the include environment variable
#define REVISION_DEFINE "SCUMMVM_INTERNAL_REVISION"
#define FIRST_ENGINE "scumm" // Name of the engine which should be sorted as first element
#define ENABLE_LANGUAGE_EXTENSIONS "" // Comma separated list of projects that need language extensions
#define DISABLE_EDIT_AND_CONTINUE "tinsel,tony,scummvm" // Comma separated list of projects that need Edit&Continue to be disabled for co-routine support (the main project is automatically added)

35
devtools/create_project/create_project.cpp
View file

@ -674,6 +674,19 @@ EngineDescList parseEngineConfigure(const std::string &engineDir);
* the name of the second operand. "false" otherwise.
*/
bool compareFSNode(const CreateProjectTool::FSNode &left, const CreateProjectTool::FSNode &right);
#ifdef FIRST_ENGINE
/**
* Compares two FSNode entries in a strict-weak fashion based on engine name
* order.
*
* @param left The first operand.
* @param right The second operand.
* @return "true" when the name of the left operand is strictly smaller than
* the name of the second operand. "false" otherwise.
*/
bool compareEngineNames(const CreateProjectTool::FSNode &left, const CreateProjectTool::FSNode &right);
#endif
} // End of anonymous namespace
EngineDescList parseEngines(const std::string &srcDir) {
@ -684,9 +697,15 @@ EngineDescList parseEngines(const std::string &srcDir) {
FileList engineFiles = listDirectory(srcDir + "/engines/");
// Sort file list alphabetically this allows for a nicer order in
// --list-engines output, for example.
#ifdef FIRST_ENGINE
// In case we want to sort an engine to the front of the list we will
// use some manual sorting predicate which assures that.
engineFiles.sort(&compareEngineNames);
#else
// Otherwise, we simply sort the file list alphabetically this allows
// for a nicer order in --list-engines output, for example.
engineFiles.sort(&compareFSNode);
#endif
for (FileList::const_iterator i = engineFiles.begin(), end = engineFiles.end(); i != end; ++i) {
// Each engine requires its own sub directory thus we will skip all
@ -833,6 +852,18 @@ EngineDescList parseEngineConfigure(const std::string &engineDir) {
bool compareFSNode(const CreateProjectTool::FSNode &left, const CreateProjectTool::FSNode &right) {
return left.name < right.name;
}
#ifdef FIRST_ENGINE
bool compareEngineNames(const CreateProjectTool::FSNode &left, const CreateProjectTool::FSNode &right) {
if (left.name == FIRST_ENGINE) {
return right.name != FIRST_ENGINE;
} else if (right.name == FIRST_ENGINE) {
return false;
} else {
return compareFSNode(left, right);
}
}
#endif
} // End of anonymous namespace
TokenList tokenize(const std::string &input, char separator) {