Merge branch 'dev' into rc

altmp · Dec 3, 2022 · ba54984 · ba54984
2 parents f9f37fe + eba29eb
commit ba54984
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/compiler/compiler.cpp b/compiler/compiler.cpp
@@ -85,8 +85,13 @@ bool Compiler::CompileModule(const std::string& fileName, bool compileDependenci
 
             // Compile the dependency file
             std::string fullFileName = package->ResolveFile(depPath, fileName);
+
             // Check if the file has already been compiled
             if(std::find(compiledFiles.begin(), compiledFiles.end(), fullFileName) != compiledFiles.end()) continue;
+
+            // Dont compile if the module is ignored
+            if(std::find(ignoredModules.begin(), ignoredModules.end(), fullFileName) != ignoredModules.end()) continue;
+
             if(!CompileModule(fullFileName, true)) return false;
         }
     }

diff --git a/module/deps/cpp-sdk b/module/deps/cpp-sdk