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

CREATE_PROJECT: Add --include-dir and --library-dir

Browse source 
Additional include and library directories can now be added.

This is most useful to Xcode Mac projects where a vanilla Homebrew setup
requires manually adding five directories through the Xcode UI and then
repeating that every time the project needs to be regenerated.

Now create_project can be scripted to regenerate a working Mac project
without any extra Xcode steps.
This commit is contained in:
sluicebox 2021-11-06 19:07:24 -05:00
parent fba53d546a
commit 16bf767de3
7 changed files with 79 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

41
devtools/create_project/create_project.cpp
View file

@ -74,6 +74,13 @@ namespace {
*/
std::string unifyPath(const std::string &path);
/**
* Removes trailing slash from path if it exists
*
* @param path Path string.
*/
void removeTrailingSlash(std::string& path);
/**
* Display the help text for the program.
*
@ -114,9 +121,7 @@ int main(int argc, char *argv[]) {
BuildSetup setup;
setup.srcDir = unifyPath(srcDir);
if (setup.srcDir.at(setup.srcDir.size() - 1) == '/')
setup.srcDir.erase(setup.srcDir.size() - 1);
removeTrailingSlash(setup.srcDir);
setup.filePrefix = setup.srcDir;
setup.outputDir = '.';
@ -258,8 +263,7 @@ int main(int argc, char *argv[]) {
}
setup.filePrefix = unifyPath(argv[++i]);
if (setup.filePrefix.at(setup.filePrefix.size() - 1) == '/')
setup.filePrefix.erase(setup.filePrefix.size() - 1);
removeTrailingSlash(setup.filePrefix);
} else if (!std::strcmp(argv[i], "--output-dir")) {
if (i + 1 >= argc) {
std::cerr << "ERROR: Missing \"path\" parameter for \"--output-dir\"!\n";
@ -267,9 +271,23 @@ int main(int argc, char *argv[]) {
}
setup.outputDir = unifyPath(argv[++i]);
if (setup.outputDir.at(setup.outputDir.size() - 1) == '/')
setup.outputDir.erase(setup.outputDir.size() - 1);
removeTrailingSlash(setup.outputDir);
} else if (!std::strcmp(argv[i], "--include-dir")) {
if (i + 1 >= argc) {
std::cerr << "ERROR: Missing \"path\" parameter for \"--include-dir\"!\n";
return -1;
}
std::string includeDir = unifyPath(argv[++i]);
removeTrailingSlash(includeDir);
setup.includeDirs.push_back(includeDir);
} else if (!std::strcmp(argv[i], "--library-dir")) {
if (i + 1 >= argc) {
std::cerr << "ERROR: Missing \"path\" parameter for \"--library-dir\"!\n";
return -1;
}
std::string libraryDir = unifyPath(argv[++i]);
removeTrailingSlash(libraryDir);
setup.libraryDirs.push_back(libraryDir);
} else if (!std::strcmp(argv[i], "--build-events")) {
setup.runBuildEvents = true;
} else if (!std::strcmp(argv[i], "--installer")) {
@ -678,6 +696,11 @@ std::string unifyPath(const std::string &path) {
return result;
}
void removeTrailingSlash(std::string& path) {
if (path.size() > 0 && path.at(path.size() - 1) == '/')
path.erase(path.size() - 1);
}
void displayHelp(const char *exe) {
using std::cout;
@ -702,6 +725,8 @@ void displayHelp(const char *exe) {
" --output-dir path overwrite path, where the project files are placed\n"
" By default this is \".\", i.e. the current working\n"
" directory\n"
" --include-dir path add a path to the include search path"
" --library-dir path add a path to the library search path"
"\n"
"MSVC specific settings:\n"
" --msvc-version version set the targeted MSVC version. Possible values:\n";