Handle project sub directories.

Author: Sibras

include/projectGenerator.h

@@ -63,6 +63,7 @@ class ProjectGenerator
     UnknownList m_unknowns;
     string m_projectName;
     string m_projectDir;
+    StaticList m_subDirs;
 
     map<string, StaticList> m_projectLibs;
 

source/projectGenerator.cpp

@@ -68,6 +68,8 @@ bool ProjectGenerator::passAllMake()
         // Check if library is enabled
         if (m_configHelper.isConfigOptionEnabled(i)) {
             m_projectDir = m_configHelper.m_rootDirectory + "lib" + i + "/";
+            const uint pos = m_projectDir.rfind('/', m_projectDir.length() - 2) + 1;
+            m_projectName = m_projectDir.substr(pos, m_projectDir.length() - 1 - pos);
             // Locate the project dir for specified library
             string retFileName;
             if (!findFile(m_projectDir + "MakeFile", retFileName)) {
@@ -185,10 +187,6 @@ void ProjectGenerator::errorFunc(const bool cleanupFiles)
 
 bool ProjectGenerator::outputProject()
 {
-    // Output the generated files
-    const uint pos = m_projectDir.rfind('/', m_projectDir.length() - 2) + 1;
-    m_projectName = m_projectDir.substr(pos, m_projectDir.length() - 1 - pos);
-
     // Check all files are correctly located
     if (!checkProjectFiles()) {
         return false;
@@ -431,6 +429,7 @@ void ProjectGenerator::outputProjectCleanup()
     m_libs.clear();
     m_unknowns.clear();
     m_projectDir.clear();
+    m_subDirs.clear();
 }
 
 bool ProjectGenerator::outputSolution()

source/projectGenerator_build.cpp

@@ -254,8 +254,9 @@ void ProjectGenerator::buildDependencyValues(StaticList& includeDirs, StaticList
     StaticList& definesShared, StaticList& definesStatic, const bool winrt) const
 {
     // Add hard dependencies
-    string dep;
+    string projRoot = "$(ProjectDir)/";
     string atomicCompatFile = m_configHelper.m_rootDirectory + "compat/atomics/win32/stdatomic.h";
+    string dep;
     if (findFile(atomicCompatFile, dep)) {
         m_configHelper.makeFileProjectRelative(atomicCompatFile, atomicCompatFile);
         uint pos = atomicCompatFile.rfind('/'); // Get path only
@@ -266,8 +267,17 @@ void ProjectGenerator::buildDependencyValues(StaticList& includeDirs, StaticList
     // Add root directory
     if (m_configHelper.m_rootDirectory != "./" && m_configHelper.m_rootDirectory != "../") {
         m_configHelper.makeFileProjectRelative(m_configHelper.m_rootDirectory, dep);
-        includeDirs.push_back("$(ProjectDir)/" + dep);
+        projRoot += dep;
+        includeDirs.push_back(projRoot);
+    }
+    
+    // Add subdirectory include dirs
+    for (const auto& sub : m_subDirs) {
+        includeDirs.push_back(projRoot + m_projectName + '/' + sub + '/');
     }
+    if (!m_subDirs.empty()) {
+        includeDirs.push_back(projRoot + m_projectName + '/');
+    }  
 
     // Determine only those dependencies that are valid for current project
     map<string, bool> projectDeps;

source/projectGenerator_pass.cpp

@@ -672,6 +672,32 @@ bool ProjectGenerator::passMake()
                         startPos = newMake.find('$', startPos);
                     }
                     makeFiles.push_back(newMake);
+                    // Add to internal list of known subdirectories
+                    const uint rootPos = newMake.find(m_configHelper.m_rootDirectory); 
+                    if (rootPos != string::npos) {
+                        newMake.erase(rootPos, m_configHelper.m_rootDirectory.length());
+                    }
+                    const uint projPos = newMake.find(m_projectName + '/');
+                    if (projPos != string::npos) {
+                        newMake.erase(projPos, m_projectName.length() + 1);
+                    }
+                    // Clean duplicate '//'
+                    uint findPos2 = newMake.find("//");
+                    while (findPos2 != string::npos) {
+                        newMake.erase(findPos2, 1);
+                        // get next
+                        findPos2 = newMake.find("//");
+                    }
+                    if (newMake[0] == '/') {
+                        newMake.erase(0, 1);
+                    }
+                    findPos2 = newMake.rfind('/');
+                    if (findPos2 != string::npos) {
+                        newMake.erase(findPos2);
+                    }
+                    if (!newMake.empty()) {
+                        m_subDirs.push_back(newMake);
+                    }
                 }
             }
             m_inputFile.close();