Merge branch 'master' into rename-tablecmds

3 files changed, 19 insertions, 6 deletions

diff --git a/tools/scaninc/scaninc.cpp b/tools/scaninc/scaninc.cpp
index b95cbd033..a3e40c5d9 100644
--- a/tools/scaninc/scaninc.cpp
+++ b/tools/scaninc/scaninc.cpp
@@ -97,19 +97,26 @@ int main(int argc, char **argv)
         }
         for (auto include : file.GetIncludes())
         {
+            bool exists = false;
+            std::string path("");
             for (auto includeDir : includeDirs)
             {
-                std::string path(includeDir + include);
+                path = includeDir + include;
                 if (CanOpenFile(path))
                 {
-                    bool inserted = dependencies.insert(path).second;
-                    if (inserted)
-                    {
-                        filesToProcess.push(path);
-                    }
+                    exists = true;
                     break;
                 }
             }
+            if (!exists && file.FileType() == SourceFileType::Asm)
+            {
+                path = include;
+            }
+            bool inserted = dependencies.insert(path).second;
+            if (inserted && exists)
+            {
+                filesToProcess.push(path);
+            }
         }
         includeDirs.pop_back();
     }
diff --git a/tools/scaninc/source_file.cpp b/tools/scaninc/source_file.cpp
index f23ff6db6..df31282f8 100644
--- a/tools/scaninc/source_file.cpp
+++ b/tools/scaninc/source_file.cpp
@@ -89,6 +89,11 @@ SourceFile::SourceFile(std::string path)
     }
 }
 
+SourceFileType SourceFile::FileType()
+{
+    return m_file_type;
+}
+
 SourceFile::~SourceFile()
 {
     if (m_file_type == SourceFileType::Cpp || m_file_type == SourceFileType::Header)
diff --git a/tools/scaninc/source_file.h b/tools/scaninc/source_file.h
index f7b6412bd..854b3f116 100644
--- a/tools/scaninc/source_file.h
+++ b/tools/scaninc/source_file.h
@@ -50,6 +50,7 @@ public:
     const std::set<std::string>& GetIncbins();
     const std::set<std::string>& GetIncludes();
     std::string& GetSrcDir();
+    SourceFileType FileType();
 
 private:
     union InnerUnion {