X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FJava%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2FModuleBuildFileGenerator.java;h=a38c3c69d19989ab5c87a2e35f365b3d0089bc39;hp=195ffdef715dabd3e3f75de69447ce9e08ef856b;hb=91a1f0d7ac1e62fb578d645c546c9c12e81f5fe2;hpb=188fdd0ac5a81d6768ec56263c7088c59837106f diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java b/Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java index 195ffdef71..a38c3c69d1 100644 --- a/Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java +++ b/Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java @@ -363,7 +363,9 @@ public class ModuleBuildFileGenerator { **/ private void applyCompileElement(Document document, Node root) { // - // sourceFiles[][0] is FileType, [][1] is File name relative to Module_Dir + // sourceFiles[][0] is FileType, + // [][1] is File name relative to Module_Dir, + // [][2] is ToolChainFamily // String[][] sourceFiles = saq.getSourceFiles(fpdModuleId.getArch()); @@ -395,9 +397,9 @@ public class ModuleBuildFileGenerator { sourceFiles[i][1] = sourceFile.getPath(); String filetype = sourceFiles[i][0]; if (filetype != null) { - fileProcess.parseFile(sourceFiles[i][1], filetype, root, true); + fileProcess.parseFile(sourceFiles[i][1], filetype, sourceFiles[i][2], root, true); } else { - fileProcess.parseFile(sourceFiles[i][1], root, true); + fileProcess.parseFile(sourceFiles[i][1], sourceFiles[i][2], root, true); } } @@ -422,7 +424,7 @@ public class ModuleBuildFileGenerator { // Parse AutoGen.c & AutoGen.h // if ( ! fpdModuleId.getModule().getName().equalsIgnoreCase("Shell")) { - fileProcess.parseFile(project.getProperty("DEST_DIR_DEBUG") + File.separatorChar + "AutoGen.c", root, false); + fileProcess.parseFile(project.getProperty("DEST_DIR_DEBUG") + File.separatorChar + "AutoGen.c", null, root, false); } // @@ -431,9 +433,9 @@ public class ModuleBuildFileGenerator { for (int i = 0; i < sourceFiles.length; i++) { String filetype = sourceFiles[i][0]; if (filetype != null) { - fileProcess.parseFile(sourceFiles[i][1], filetype, root, false); + fileProcess.parseFile(sourceFiles[i][1], filetype, sourceFiles[i][2], root, false); } else { - fileProcess.parseFile(sourceFiles[i][1], root, false); + fileProcess.parseFile(sourceFiles[i][1], sourceFiles[i][2], root, false); } }