ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

DEVTOOLS: Add precompiled header support to MSBuild/MSVC.

Browse Source
This commit is contained in:
elasota
2023-09-29 21:37:10 +01:00
committed by Daniel
parent f22326d4a7
commit 667cb63823
11 changed files with 396 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
devtools/create_project/create_project.cpp
+141 -24
View File
@@ -1319,6 +1319,55 @@ void splitPath(const std::string &path, std::string &dir, std::string &file) {
file = (sep == std::string::npos) ? std::string() : path.substr(sep + 1);
}
bool calculatePchPaths(const std::string &sourceFilePath, const std::string &pchIncludeRoot, const StringList &pchDirs, const StringList &pchExclude, char separator, std::string &outPchIncludePath, std::string &outPchFilePath, std::string &outPchFileName) {
std::string compareName, extensionName;
splitFilename(sourceFilePath, compareName, extensionName);
// Is this file excluded?
if (std::find(pchExclude.begin(), pchExclude.end(), compareName) != pchExclude.end())
return false;
size_t lastDelimiter = sourceFilePath.find_last_of(separator);
if (lastDelimiter == std::string::npos)
lastDelimiter = 0;
std::string pchDirectory = sourceFilePath.substr(0, lastDelimiter);
if (std::find(pchDirs.begin(), pchDirs.end(), pchDirectory) == pchDirs.end())
return false;
// This file uses a PCH
if (pchDirectory.size() < pchIncludeRoot.size() || pchDirectory.substr(0, pchIncludeRoot.size()) != pchIncludeRoot) {
error("PCH prefix for file '" + sourceFilePath + "' wasn't located under PCH include root '" + pchIncludeRoot + "'");
}
size_t pchDirNamePos = pchDirectory.find_last_of(separator);
if (pchDirNamePos == std::string::npos)
pchDirNamePos = 0;
else
pchDirNamePos++;
std::string pchFileName = pchDirectory.substr(pchDirNamePos) + "_pch.h";
std::string pchPath = (pchDirectory + separator + pchFileName);
// Convert to the local file prefix
std::string includePath = pchPath.substr(pchIncludeRoot.size());
if (separator != '/') {
for (std::string::iterator ch = includePath.begin(), chEnd = includePath.end(); ch != chEnd; ++ch) {
if (*ch == separator)
*ch = '/';
}
}
outPchIncludePath = includePath;
outPchFilePath = pchPath;
outPchFileName = pchFileName;
return true;
}
std::string basename(const std::string &fileName) {
const std::string::size_type slash = fileName.find_last_of('/');
if (slash == std::string::npos)
@@ -1586,7 +1635,7 @@ void ProjectProvider::createProject(BuildSetup &setup) {
createWorkspace(setup);
StringList in, ex;
StringList in, ex, pchDirs, pchEx;
// Create project files
for (UUIDMap::const_iterator i = _engineUuidMap.begin(); i != _engineUuidMap.end(); ++i) {
@@ -1595,11 +1644,13 @@ void ProjectProvider::createProject(BuildSetup &setup) {
// Retain the files between engines if we're creating a single project
in.clear();
ex.clear();
pchDirs.clear();
pchEx.clear();
const std::string moduleDir = setup.srcDir + targetFolder + i->first;
createModuleList(moduleDir, setup.defines, setup.testDirs, in, ex);
createProjectFile(i->first, i->second, setup, moduleDir, in, ex);
createModuleList(moduleDir, setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
createProjectFile(i->first, i->second, setup, moduleDir, in, ex, setup.srcDir + targetFolder, pchDirs, pchEx);
}
// Create engine-detection submodules.
@@ -1623,37 +1674,40 @@ void ProjectProvider::createProject(BuildSetup &setup) {
}
for (std::vector<std::string>::const_iterator i = detectionModuleDirs.begin(), end = detectionModuleDirs.end(); i != end; ++i) {
createModuleList(*i, setup.defines, setup.testDirs, in, ex, true);
StringList tempPchDirs, tempSchEx; // No PCH for detection
createModuleList(*i, setup.defines, setup.testDirs, in, ex, tempPchDirs, tempSchEx, true);
}
createProjectFile(detProject, detUUID, setup, setup.srcDir + "/engines", in, ex);
createProjectFile(detProject, detUUID, setup, setup.srcDir + "/engines", in, ex, "", StringList(), StringList());
}
if (!setup.devTools) {
// Last but not least create the main project file.
in.clear();
ex.clear();
pchDirs.clear();
pchEx.clear();
// File list for the Project file
createModuleList(setup.srcDir + "/backends", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/backends/platform/sdl", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/base", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/common", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/common/compression", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/common/formats", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/common/lua", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/engines", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/graphics", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/gui", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/audio", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/video", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/image", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/math", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/backends", setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
createModuleList(setup.srcDir + "/backends/platform/sdl", setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
createModuleList(setup.srcDir + "/base", setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
createModuleList(setup.srcDir + "/common", setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
createModuleList(setup.srcDir + "/common/compression", setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
createModuleList(setup.srcDir + "/common/formats", setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
createModuleList(setup.srcDir + "/common/lua", setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
createModuleList(setup.srcDir + "/engines", setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
createModuleList(setup.srcDir + "/graphics", setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
createModuleList(setup.srcDir + "/gui", setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
createModuleList(setup.srcDir + "/audio", setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
createModuleList(setup.srcDir + "/video", setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
createModuleList(setup.srcDir + "/image", setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
createModuleList(setup.srcDir + "/math", setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
if (getFeatureBuildState("mt32emu", setup.features))
createModuleList(setup.srcDir + "/audio/softsynth/mt32", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/audio/softsynth/mt32", setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
if (setup.tests) {
createModuleList(setup.srcDir + "/test", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/test", setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
} else {
// Resource files
addResourceFiles(setup, in, ex);
@@ -1678,7 +1732,7 @@ void ProjectProvider::createProject(BuildSetup &setup) {
}
// Create the main project file.
createProjectFile(setup.projectName, svmUUID, setup, setup.srcDir, in, ex);
createProjectFile(setup.projectName, svmUUID, setup, setup.srcDir, in, ex, setup.srcDir + '/', pchDirs, pchEx);
}
// Create other misc. build files
@@ -1827,15 +1881,16 @@ std::string ProjectProvider::getLastPathComponent(const std::string &path) {
void ProjectProvider::addFilesToProject(const std::string &dir, std::ostream &projectFile,
const StringList &includeList, const StringList &excludeList,
const std::string &pchIncludeRoot, const StringList &pchDirs, const StringList &pchExclude,
const std::string &filePrefix) {
FileNode *files = scanFiles(dir, includeList, excludeList);
writeFileListToProject(*files, projectFile, 0, std::string(), filePrefix + '/');
writeFileListToProject(*files, projectFile, 0, std::string(), filePrefix + '/', pchIncludeRoot, pchDirs, pchExclude);
delete files;
}
void ProjectProvider::createModuleList(const std::string &moduleDir, const StringList &defines, StringList &testDirs, StringList &includeList, StringList &excludeList, bool forDetection) const {
void ProjectProvider::createModuleList(const std::string &moduleDir, const StringList &defines, StringList &testDirs, StringList &includeList, StringList &excludeList, StringList &pchDirs, StringList &pchExclude, bool forDetection) const {
const std::string moduleMkFile = moduleDir + "/module.mk";
std::ifstream moduleMk(moduleMkFile.c_str());
if (!moduleMk)
@@ -1948,6 +2003,68 @@ void ProjectProvider::createModuleList(const std::string &moduleDir, const Strin
++i;
}
}
} else if (*i == "MODULE_PCH_DIRS") {
if (tokens.size() < 3)
error("Malformed MODULE_PCH_DIRS definition in " + moduleMkFile);
++i;
// This is not exactly correct, for example an ":=" would usually overwrite
// all already added files, but since we do only save the files inside
// includeList or excludeList currently, we couldn't handle such a case easily.
// (includeList and excludeList should always preserve their entries, not added
// by this function, thus we can't just clear them on ":=" or "=").
// But hopefully our module.mk files will never do such things anyway.
if (*i != ":=" && *i != "+=" && *i != "=")
error("Malformed MODULE_PCH_DIRS definition in " + moduleMkFile);
++i;
while (i != tokens.end()) {
if (*i == "\\") {
std::getline(moduleMk, line);
tokens = tokenize(line);
i = tokens.begin();
} else {
std::string filename = moduleDir;
if ((*i) != ".")
filename += "/" + unifyPath(*i);
if (shouldInclude.top())
pchDirs.push_back(filename);
++i;
}
}
} else if (*i == "MODULE_PCH_EXCLUDE") {
if (tokens.size() < 3)
error("Malformed MODULE_PCH_EXCLUDE definition in " + moduleMkFile);
++i;
// This is not exactly correct, for example an ":=" would usually overwrite
// all already added files, but since we do only save the files inside
// includeList or excludeList currently, we couldn't handle such a case easily.
// (includeList and excludeList should always preserve their entries, not added
// by this function, thus we can't just clear them on ":=" or "=").
// But hopefully our module.mk files will never do such things anyway.
if (*i != ":=" && *i != "+=" && *i != "=")
error("Malformed MODULE_PCH_EXCLUDE definition in " + moduleMkFile);
++i;
while (i != tokens.end()) {
if (*i == "\\") {
std::getline(moduleMk, line);
tokens = tokenize(line);
i = tokens.begin();
} else {
const std::string filename = moduleDir + "/" + unifyPath(*i);
if (shouldInclude.top())
pchExclude.push_back(filename);
++i;
}
}
} else if (*i == "KYRARPG_COMMON_OBJ") {
// HACK to fix EOB/LOL compilation in the kyra engine: add the
// files defined in the KYRARPG_COMMON_OBJ variable in a list