X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2FGenBuildTask.java;h=2d3318d551bceae007e592ababd5a2cdec96b55d;hp=2d91991b8a9b92fe07eac3d8d33c5eff4ff5896b;hb=c43c67195a60f1e002553cd8b2cf876903e3f801;hpb=878ddf1fc3540a715f63594ed22b6929e881afb4;ds=sidebyside

diff --git a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
index 2d91991b8a..2d3318d551 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
@@ -237,8 +237,8 @@ public class GenBuildTask extends Task {
         // Update flags like CC_FLAGS, LIB_FLAGS etc.
         //
         flagsSetup();
-        GlobalData.addLibrary(baseName, getProject().getProperty("BIN_DIR") + File.separatorChar + baseName + ".lib");
-        GlobalData.addModuleLibrary(baseName, libraries);
+        GlobalData.addLibrary(baseName, arch, getProject().getProperty("BIN_DIR") + File.separatorChar + baseName + ".lib");
+        GlobalData.addModuleLibrary(baseName, arch, libraries);
         //
         // If ComponentType is USER_DEFINED,
         // then call the exist BaseName_build.xml directly.
@@ -267,6 +267,20 @@ public class GenBuildTask extends Task {
         ant.execute();
     }
 
+    /**
+      Return the name of the directory that corresponds to the architecture.
+      This is a translation from the XML Schema tag to a directory that
+      corresponds to our directory name coding convention.
+     
+    **/
+    private String archDir(String arch) {
+        return arch.replaceFirst("X64", "x64")
+                   .replaceFirst("IPF", "Ipf")
+                   .replaceFirst("IA32", "Ia32")
+                   .replaceFirst("ARM", "Arm")
+                   .replaceFirst("EBC", "Ebc");
+    }
+
     /**
       Get the dependent library instances and include package name from 
       surface area, and initialize module include pathes. 
@@ -281,7 +295,7 @@ public class GenBuildTask extends Task {
                 includes.add("${WORKSPACE_DIR}" + File.separatorChar + GlobalData.getPackagePath(packageName)
                              + File.separatorChar + "Include");
                 includes.add("${WORKSPACE_DIR}" + File.separatorChar + GlobalData.getPackagePath(packageName)
-                             + File.separatorChar + "Include" + File.separatorChar + "${ARCH}");
+                             + File.separatorChar + "Include" + File.separatorChar + archDir(arch));
             }
         }
         includes.add("${DEST_DIR_DEBUG}");