X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FConf%2FBuildMacro.xml;h=2e1d6ad737e194aa75393c9e075af4db9c4835d8;hp=b3a6ff1c3a3b4541fea03bbd7fb19f3fe3a03e54;hb=ba6e17fe11a889992dae7f0393dc30bd7da022e6;hpb=75d0c5b183b87b2fabc1a55496f82364da29c154

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index b3a6ff1c3a..2e1d6ad737 100644
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -10,13 +10,94 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 -->
 <project name="common">
+  <!-- for user extended tasks or macros -->
+  <import file="UserExtension.xml" optional="true"/>
+
+  <!--
+    Macro for intialize some properties. This Macro build will be called before source file build.
+    -->
+  <macrodef name="Build_Init">
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <sequential>
+      <var name="OBJECTS" value="" />
+      <var name="SDB_FILES" value="" />
+
+      <mkdir dir="${DEST_DIR_DEBUG}"/>
+      <mkdir dir="${DEST_DIR_OUTPUT}"/>
+
+      <if>
+        <and>
+          <isset property="PCH"/>
+          <not>
+            <equals arg1="${PCH}" arg2=""/>
+          </not>
+        </and>
+        <then>
+          <makedeps DepsFile="${DEST_DIR_OUTPUT}/AutoGen.h.dep"
+                    TargetFile="${DEST_DIR_OUTPUT}/AutoGen.h.gch">
+            <input file="${DEST_DIR_DEBUG}/AutoGen.h"/>
+            <EXTRA.INC/>
+          </makedeps>
+
+          <OnDependency>
+            <sourcefiles>
+              <file ListFile="${DEST_DIR_OUTPUT}/AutoGen.h.dep"/>
+            </sourcefiles>
+            <targetfiles>
+              <file Name="${DEST_DIR_OUTPUT}/AutoGen.h.gch"/>
+            </targetfiles>
+
+            <sequential>
+              <!-- Generate pre-compiled header -->
+              <cc userdefine="on">
+                <command type="CC" cmd="${PCH}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}"
+                    outputFile="${DEST_DIR_OUTPUT}/AutoGen.h.obj" dpath="${CC_DPATH}" libpath="${CC_LIBPATH}"
+                    include="${CC_INCLUDEPATH}">
+                  <EXTRA.INC/>
+                  <argument value="${PCH_FLAGS}"/>
+                  <EXTRA.ARG/>
+                  <fileset casesensitive="on" file="${DEST_DIR_DEBUG}/AutoGen.h"/>
+                </command>
+              </cc>
+
+              <if>
+                <equals arg1="${CC_FAMILY}" arg2="GCC"/>
+                <then>
+                  <move file="${DEST_DIR_OUTPUT}/AutoGen.h.obj" tofile="${DEST_DIR_DEBUG}/AutoGen.h.gch" overwrite="true"/>
+                </then>
+              </if>
+            </sequential>
+          </OnDependency>
+
+          <if>
+            <not>
+              <equals arg1="${CC_FAMILY}" arg2="GCC"/>
+            </not>
+            <then>
+              <var name="OBJECTS" value="${OBJECTS} AutoGen.h.obj"/>
+            </then>
+          </if>
+        </then>
+        <else>
+          <makedeps DepsFile="${DEST_DIR_OUTPUT}/AutoGen.h.dep">
+            <input file="${DEST_DIR_DEBUG}/AutoGen.h"/>
+            <EXTRA.INC/>
+          </makedeps>
+        </else>
+      </if>
+    </sequential>
+  </macrodef>
+
+
   <!--
     macro definitions for building files with different types
     -->
   <!--
     C Code
     -->
-  <macrodef name="Build_C_Code">
+  <macrodef name="Build_CCode">
     <attribute name="FILEPATH"/>
     <attribute name="FILENAME"/>
     <attribute name="FILEEXT" default="c"/>
@@ -25,25 +106,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>
 
     <sequential>
+      <var name="FILE_BASENAME" value="@{FILENAME}" />
+      <var name="FILE_PATH" value="@{FILEPATH}" />
       <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>
 
-      <if>
-        <available type="file" file="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
-        <then>
-          <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep">
-            <input file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
-            <input file="${DEST_DIR_DEBUG}/AutoGen.h"/>
-            <includepath path="${WORKSPACE_DIR}"/>
-            <includepath path="${MODULE_DIR}"/>
-            <includepath path="${MODULE_DIR}/${ARCH}"/>
-            <EXTRA.INC/>
-          </makedeps>
-        </then>
-      </if>
+      <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep"
+                TargetFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj">
+        <input file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+        <EXTRA.INC/>
+      </makedeps>
 
       <OnDependency>
         <sourcefiles>
           <file ListFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep"/>
+          <file ListFile="${DEST_DIR_OUTPUT}/AutoGen.h.dep"/>
         </sourcefiles>
         <targetfiles>
           <file Name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
@@ -51,29 +127,27 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
         <sequential>
           <cc userdefine="on">
-            <command type="CC" workdir="${DEST_DIR_OUTPUT}">
-              <includepath path="${WORKSPACE_DIR}"/>
-              <includepath path="${MODULE_DIR}"/>
-              <includepath path="${MODULE_DIR}/${ARCH}"/>
+            <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}"
+                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" dpath="${CC_DPATH}"
+                libpath="${CC_LIBPATH}" include="${CC_INCLUDEPATH}">
               <EXTRA.INC/>
-
               <argument value="${CC_FLAGS}"/>
               <EXTRA.ARG/>
-              <!-- <argument value="/FI${DEST_DIR_DEBUG}/AutoGen.h" /> -->
-              <includeFile value="${DEST_DIR_DEBUG}/AutoGen.h"/>
-              <!-- <argument value="/Fo${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/> -->
-              <outputFile value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
-
-              <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+              <fileset casesensitive="on" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
             </command>
           </cc>
         </sequential>
       </OnDependency>
-
-      <!--
-        for library generation later
-        -->
-      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/> 
+      <!-- Since fileset can't scan file start with ./, remove ./ in previous. -->
+      <if>
+        <equals arg1="@{FILEPATH}" arg2="." />
+        <then>
+          <var name="OBJECTS" value="${OBJECTS} @{FILENAME}.obj" />
+        </then>
+        <else>
+          <var name="OBJECTS" value="${OBJECTS} @{FILEPATH}/@{FILENAME}.obj" />
+        </else>
+      </if>
     </sequential>
   </macrodef>
 
@@ -87,25 +161,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>
 
     <sequential>
+      <var name="FILE_BASENAME" value="@{FILENAME}" />
+      <var name="FILE_PATH" value="@{FILEPATH}" />
       <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>
 
-      <if>
-        <available type="file" file="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
-        <then>
-          <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep">
-            <input file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
-            <input file="${DEST_DIR_DEBUG}/AutoGen.h"/>
-            <includepath path="${WORKSPACE_DIR}"/>
-            <includepath path="${MODULE_DIR}"/>
-            <includepath path="${MODULE_DIR}/${ARCH}"/>
-            <EXTRA.INC/>
-          </makedeps>
-        </then>
-      </if>
+      <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep"
+                TargetFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj">
+        <input file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+        <EXTRA.INC/>
+      </makedeps>
 
       <OnDependency>
         <sourcefiles>
           <file ListFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep"/>
+          <file ListFile="${DEST_DIR_OUTPUT}/AutoGen.h.dep"/>
         </sourcefiles>
         <targetfiles>
           <file Name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
@@ -113,32 +182,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
         <sequential>
           <cc userdefine="on">
-            <command type="CC" workdir="${DEST_DIR_OUTPUT}">
-              <includepath path="${WORKSPACE_DIR}"/>
-              <includepath path="${MODULE_DIR}"/>
-              <includepath path="${MODULE_DIR}/${ARCH}"/>
+            <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}"
+                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" dpath="${CC_DPATH}"
+                libpath="${CC_LIBPATH}" include="${CC_INCLUDEPATH}">
               <EXTRA.INC/>
-    
               <argument value="${CC_FLAGS}"/>
               <EXTRA.ARG/>
-              <!-- <argument value="/FI${DEST_DIR_DEBUG}/AutoGen.h" />  -->
-              <includeFile value="${DEST_DIR_DEBUG}/AutoGen.h"/>
-              <!-- <argument value="/Fo${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/> -->
-              <outputFile value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
-    
-              <fileset casesensitive="off" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+              <fileset casesensitive="on" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
             </command>
           </cc>
         </sequential>
       </OnDependency>
-      <!--
-        for library generation later
-        -->
-      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/> 
+      <!-- Since fileset can't scan file start with ./, remove ./ in previous. -->
+      <if>
+        <equals arg1="@{FILEPATH}" arg2="." />
+        <then>
+          <var name="OBJECTS" value="${OBJECTS} @{FILENAME}.obj" />
+        </then>
+        <else>
+          <var name="OBJECTS" value="${OBJECTS} @{FILEPATH}/@{FILENAME}.obj" />
+        </else>
+      </if>
     </sequential>
   </macrodef>
 
-  <macrodef name="Build_Dependency_File">
+  <macrodef name="Build_DPX">
     <attribute name="FILEPATH"/>
     <attribute name="FILENAME"/>
     <attribute name="FILEEXT" default="dxs"/>
@@ -146,57 +214,87 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.INC" optional="yes"/>
     <element name="EXTRA.ARG" optional="yes"/>
 
+
     <sequential>
+      <var name="FILE_BASENAME" value="@{FILENAME}" />
+      <var name="FILE_PATH" value="@{FILEPATH}" />
       <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>
 
+      <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep"
+                TargetFile="${DEST_DIR_OUTPUT}/${BASE_NAME}.depex">
+        <input file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+        <EXTRA.INC/>
+      </makedeps>
+
       <OnDependency>
         <sourcefiles>
-          <file name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+          <!--file name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/-->
+          <file ListFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep"/>
+          <file ListFile="${DEST_DIR_OUTPUT}/AutoGen.h.dep"/>
         </sourcefiles>
         <targetfiles>
-          <file name="${DEST_DIR_OUTPUT}/${BASE_NAME}.@{FILEEXT}.depex"/>
+          <file name="${DEST_DIR_OUTPUT}/${BASE_NAME}.depex"/>
         </targetfiles>
 
         <sequential>
-          <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" 
-                tofile="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.c"/>
-
           <cc userdefine="on">
-            <command type="CC" workdir=".">
-              <includepath path="${DEST_DIR_DEBUG}" /> 
-              <includepath path="${WORKSPACE_DIR}"/>
-              <includepath path="${MODULE_DIR}"/>
-              <includepath path="${MODULE_DIR}/${ARCH}"/>
+            <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${CC_FAMILY}"
+                     outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.i" dpath="${CC_DPATH}"
+                     libpath="${CC_LIBPATH}" include="${CC_INCLUDEPATH}">
               <EXTRA.INC/>
               <argument value="${PP_FLAGS}"/>
-              <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.c"/>
-              <outputFile value="@{FILENAME}.@{FILEEXT}.i"/>
+              <fileset casesensitive="on" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
             </command>
           </cc>
-    
-          <gendepex inputFile="@{FILENAME}.@{FILEEXT}.i" outputFile="${DEST_DIR_OUTPUT}/${BASE_NAME}.@{FILEEXT}.depex"/>
-          <delete file="@{FILENAME}.@{FILEEXT}.i" />
-          <delete file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.c" /> 
+
+          <gendepex inputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.i" outputFile="${DEST_DIR_OUTPUT}/${BASE_NAME}.depex"/>
         </sequential>
       </OnDependency>
     </sequential>
   </macrodef>
-  
-<!-- Usage Example
-   <Build_C_Code
-     FILEPATH="."
-     FILENAME="${SOURCE_NAME}"
-     FILEEXT="c">
-     <EXTRA.INC>
-       <includepath path="${PACKAGE_DIR}/Include"/>
-       <includepath path="${PACKAGE_DIR}/Include/${ARCH}"/>
-     </EXTRA.INC>
-
-     <EXTRA.ARG>
-       <argument value="/D EFI_DEBUG /D EFI_WHATEVER_FLAG"/>
-     </EXTRA.ARG>
-   </Build_C_Code>
-  -->
+
+  <macrodef name="Build_ASM">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="asm"/>
+
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <!-- Dispath ASM file, there are three type.
+         asm     -   Build_Assembly
+         S       -   Build_Gcc_Assembly
+         s       -   Build_Ipf_Assembly -->
+    <sequential>
+	    <if>
+        <equals arg1="@{FILEEXT}" arg2="asm" />
+	      <then>
+	        <Build_Assembly FILEPATH="@{FILEPATH}" FILENAME="@{FILENAME}" FILEEXT="@{FILEEXT}">
+            <EXTRA.INC.1><EXTRA.INC /></EXTRA.INC.1>
+            <EXTRA.ARG.1><EXTRA.ARG /></EXTRA.ARG.1>
+          </Build_Assembly>
+	      </then>
+        <elseif>
+          <equals arg1="@{FILEEXT}" arg2="S" />
+          <then>
+            <Build_Gcc_Assembly FILEPATH="@{FILEPATH}" FILENAME="@{FILENAME}" FILEEXT="@{FILEEXT}">
+              <EXTRA.INC.1><EXTRA.INC /></EXTRA.INC.1>
+              <EXTRA.ARG.1><EXTRA.ARG /></EXTRA.ARG.1>
+            </Build_Gcc_Assembly>
+          </then>
+        </elseif>
+	      <elseif>
+	        <equals arg1="@{FILEEXT}" arg2="s" />
+	        <then>
+	          <Build_IPF_Assembly_Code FILEPATH="@{FILEPATH}" FILENAME="@{FILENAME}" FILEEXT="@{FILEEXT}">
+	            <EXTRA.INC.1><EXTRA.INC /></EXTRA.INC.1>
+              <EXTRA.ARG.1><EXTRA.ARG /></EXTRA.ARG.1>
+            </Build_IPF_Assembly_Code>
+	        </then>
+	      </elseif>
+	    </if>
+    </sequential>
+  </macrodef>
 
   <!--
     IA32/x64 Assembly
@@ -206,15 +304,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <attribute name="FILENAME"/>
     <attribute name="FILEEXT" default="asm"/>
 
-    <element name="EXTRA.INC" optional="yes"/>
-    <element name="EXTRA.ARG" optional="yes"/>
+    <element name="EXTRA.INC.1" optional="yes"/>
+    <element name="EXTRA.ARG.1" optional="yes"/>
 
     <sequential>
+      <var name="FILE_BASENAME" value="@{FILENAME}" />
+      <var name="FILE_PATH" value="@{FILEPATH}" />
       <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>
 
+      <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep"
+                TargetFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj">
+        <input file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+        <EXTRA.INC.1/>
+      </makedeps>
+
       <OnDependency>
         <sourcefiles>
-          <file Name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+          <file Listfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep"/>
+          <file ListFile="${DEST_DIR_OUTPUT}/AutoGen.h.dep"/>
         </sourcefiles>
         <targetfiles>
           <file Name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
@@ -222,121 +329,111 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
         <sequential>
           <cc userdefine="on">
-            <command type="ASM">
-              <includepath path="${WORKSPACE_DIR}"/>
-              <includepath path="${MODULE_DIR}"/>
-              <includepath path="${MODULE_DIR}/${ARCH}"/>
-              <EXTRA.INC/>
-      
-              <argument value="${ASM_FLAGS}"/>
-              <EXTRA.ARG/>
-              <argument value="/Fl${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.lst"/>
-              <OutputFile value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
-      
-              <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+            <command type="PP" cmd="${PP}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${PP_FAMILY}"
+                dpath="${PP_DPATH}" libpath="${PP_LIBPATH}" include="${PP_INCLUDEPATH}">
+              <EXTRA.INC.1/>
+              <argument value="${PP_FLAGS}"/>
+              <fileset casesensitive="on" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
             </command>
           </cc>
-        </sequential>
-      </OnDependency>
-      <!--
-        for library generation later
-        -->
-      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
-    </sequential>
-  </macrodef>
-
-  <!--
-    Library    private HashMap map = new HashMap();
-    -->
-  <macrodef name="Build_Library">
-    <attribute name="FILENAME" />
-    <attribute name="FILEEXT" default="obj"/>
 
-    <element name="EXTRA.INC" optional="yes"/>
-    <element name="EXTRA.ARG" optional="yes"/>
+          <replaceregexp file="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.i"
+                         match="^(#line +1 +.*@{FILEPATH}/@{FILENAME}\.@{FILEEXT}&quot;).+\1"
+                         replace=";"
+                         flags="gs"/>
+          <replaceregexp file="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.i"
+                         match="^(#line .*)$"
+                         replace="; \1"
+                         byline="true"/>
+          <replaceregexp file="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.i"
+                         match="([^_a-zA-Z])0x([0-9a-fA-F]+)"
+                         replace="\10\2h"
+                         flags="g"
+                         byline="true"/>
 
-    <sequential>
-      <mkdir dir="${BIN_DIR}"/>
+          <cc userdefine="on">
+            <command type="ASM" cmd="${ASM}" workdir="${DEST_DIR_OUTPUT}" family="${ASM_FAMILY}"
+                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" dpath="${ASM_DPATH}"
+                libpath="${ASM_LIBPATH}" include="${ASM_INCLUDEPATH}">
+              <EXTRA.INC.1/>
 
-      <OnDependency>
-        <sourcefiles>
-          <file list="${OBJECTS}"/>
-        </sourcefiles>
-        <targetfiles>
-          <file name="${BIN_DIR}/@{FILENAME}.lib"/>
-        </targetfiles>
+              <argument value="${ASM_FLAGS}"/>
+              <EXTRA.ARG.1/>
 
-        <sequential>
-          <!--  <echo>re-generate library</echo> -->
-          <cc userdefine="on">
-            <command type="LIB">
-              <argument value="${LIB_FLAGS}"/>
-              <!--<argument value="${OBJECTS}"/>-->
-              <FileList dir="" files="${OBJECTS}"/>
-              <!-- <argument value="/out:${BIN_DIR}/@{FILENAME}.lib"/> -->
-              <OutputFile value="${BIN_DIR}/@{FILENAME}.lib"/>
+              <fileset casesensitive="on" file="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.i"/>
             </command>
           </cc>
         </sequential>
       </OnDependency>
+      <!-- Since fileset can't scan file start with ./, remove ./ in previous. -->
+      <if>
+        <equals arg1="@{FILEPATH}" arg2="." />
+        <then>
+          <var name="OBJECTS" value="${OBJECTS} @{FILENAME}.obj" />
+        </then>
+        <else>
+          <var name="OBJECTS" value="${OBJECTS} @{FILEPATH}/@{FILENAME}.obj" />
+        </else>
+      </if>
     </sequential>
   </macrodef>
 
   <!--
-    GCC Assembly
+    Build GCC assembly code
     -->
-  <macrodef name="Build_GCC_Assembly_Code">
+  <macrodef name="Build_Gcc_Assembly">
     <attribute name="FILEPATH"/>
     <attribute name="FILENAME"/>
-    <attribute name="FILEEXT" default="s"/>
+    <attribute name="FILEEXT" default="asm"/>
 
-    <element name="EXTRA.INC" optional="yes"/>
-    <element name="EXTRA.ARG" optional="yes"/>
+    <element name="EXTRA.INC.1" optional="yes"/>
+    <element name="EXTRA.ARG.1" optional="yes"/>
 
     <sequential>
+      <var name="FILE_BASENAME" value="@{FILENAME}" />
+      <var name="FILE_PATH" value="@{FILEPATH}" />
       <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>
 
-      <if>
-        <available type="file" file="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
-        <then>
-          <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep">
-            <input file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
-            <includepath path="${WORKSPACE_DIR}"/>
-            <includepath path="${MODULE_DIR}"/>
-            <includepath path="${MODULE_DIR}/${ARCH}"/>
-            <EXTRA.INC/>
-          </makedeps>
-        </then>
-      </if>
+      <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep"
+                TargetFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj">
+        <input file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+        <EXTRA.INC.1/>
+      </makedeps>
 
       <OnDependency>
         <sourcefiles>
-          <file listfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep"/>
+          <file Listfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep"/>
+          <file ListFile="${DEST_DIR_OUTPUT}/AutoGen.h.dep"/>
         </sourcefiles>
         <targetfiles>
-          <file name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
+          <file Name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
         </targetfiles>
 
         <sequential>
-      
           <cc userdefine="on">
-            <command type="ASM" includepathDelimiter="-I">
-              <EXTRA.INC/>
-      
+            <command type="ASM" cmd="${ASM}" workdir="${DEST_DIR_OUTPUT}" family="${ASM_FAMILY}"
+                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" dpath="${ASM_DPATH}"
+                libpath="${ASM_LIBPATH}" include="${ASM_INCLUDEPATH}">
+              <EXTRA.INC.1/>
+
               <argument value="${ASM_FLAGS}"/>
-              <EXTRA.ARG/>
-              <!-- <argument value="-o ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/> -->
-              <OutputFile value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
-      
-              <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+              <EXTRA.ARG.1/>
+
+              <fileset casesensitive="on" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
             </command>
           </cc>
         </sequential>
       </OnDependency>
-      <!--
-        for library generation later
-        -->
-      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
+      <!-- Since fileset can't scan file start with ./, remove ./ in previous. -->
+      <if>
+        <equals arg1="@{FILEPATH}" arg2="." />
+        <then>
+          <var name="OBJECTS" value="${OBJECTS} @{FILENAME}.obj" />
+        </then>
+        <else>
+          <var name="OBJECTS" value="${OBJECTS} @{FILEPATH}/@{FILENAME}.obj" />
+        </else>
+      </if>
     </sequential>
   </macrodef>
 
@@ -348,74 +445,67 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <attribute name="FILENAME"/>
     <attribute name="FILEEXT" default="s"/>
 
-    <element name="EXTRA.INC" optional="yes"/>
-    <element name="EXTRA.ARG" optional="yes"/>
+    <element name="EXTRA.INC.1" optional="yes"/>
+    <element name="EXTRA.ARG.1" optional="yes"/>
 
     <sequential>
       <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>
 
-      <if>
-        <available type="file" file="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
-        <then>
-          <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep">
-            <input file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
-            <includepath path="${WORKSPACE_DIR}"/>
-            <includepath path="${MODULE_DIR}"/>
-            <includepath path="${MODULE_DIR}/${ARCH}"/>
-            <EXTRA.INC/>
-          </makedeps>
-        </then>
-      </if>
+      <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep"
+                TargetFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj">
+        <input file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+        <EXTRA.INC.1/>
+      </makedeps>
 
       <OnDependency>
         <sourcefiles>
           <file listfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep"/>
+          <file ListFile="${DEST_DIR_OUTPUT}/AutoGen.h.dep"/>
         </sourcefiles>
         <targetfiles>
           <file name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
         </targetfiles>
 
         <sequential>
-          <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" 
-                tofile="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.c"/>
           <cc userdefine="on">
-            <command type="CC" workdir="."> 
-              <includepath path="${WORKSPACE_DIR}"/>
-              <includepath path="${MODULE_DIR}"/>
-              <includepath path="${MODULE_DIR}/${ARCH}"/>
-              <EXTRA.INC/>
-              <argument value="${PP_FLAGS}"/>
-              <fileset casesensitive="off" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.c"/>
+            <command type="PP" cmd="${APP}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${APP_FAMILY}"
+                dpath="${APP_DPATH}" libpath="${APP_LIBPATH}" include="${APP_INCLUDEPATH}">
+              <EXTRA.INC.1/>
+              <argument value="${APP_FLAGS}"/>
+              <fileset casesensitive="on" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
             </command>
           </cc>
-          <move file="@{FILENAME}.@{FILEEXT}.i" 
-                tofile="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.pro"/>
-      
+
           <cc userdefine="on">
-            <command type="ASM" includepathDelimiter="-I">
-              <includepath path="${WORKSPACE_DIR}"/>
-              <includepath path="${MODULE_DIR}"/>
-              <includepath path="${MODULE_DIR}/${ARCH}"/>
-              <EXTRA.INC/>
-      
+            <command type="ASM" cmd="${ASM}" workdir="${DEST_DIR_OUTPUT}" family="${ASM_FAMILY}"
+                includepathDelimiter="-I" outputDelimiter="-o" dpath="${ASM_DPATH}"
+                libpath="${ASM_LIBPATH}" include="${ASM_INCLUDEPATH}"
+                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj">
+              <EXTRA.INC.1/>
               <argument value="${ASM_FLAGS}"/>
-              <EXTRA.ARG/>
-              <!-- <argument value="-o ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/> -->
-              <OutputFile value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
-      
-              <fileset casesensitive="off" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.pro"/>
+              <EXTRA.ARG.1/>
+              <fileset casesensitive="on" file="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.i"/>
             </command>
           </cc>
         </sequential>
       </OnDependency>
-      <!--
-        for library generation later
-        -->
-      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
+      <!-- Since fileset can't scan file start with ./, remove ./ in previous. -->
+      <if>
+        <equals arg1="@{FILEPATH}" arg2="." />
+        <then>
+          <var name="OBJECTS" value="${OBJECTS} @{FILENAME}.obj" />
+        </then>
+        <else>
+          <var name="OBJECTS" value="${OBJECTS} @{FILEPATH}/@{FILENAME}.obj" />
+        </else>
+      </if>
     </sequential>
   </macrodef>
 
 
+  <!--
+    Assembly the preprocessed IPF assembly code
+  -->
   <macrodef name="Build_IPF_PP_Code">
     <attribute name="FILEPATH"/>
     <attribute name="FILENAME"/>
@@ -426,51 +516,72 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
     <sequential>
       <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>
-  
+
       <cc userdefine="on">
-        <command type="ASM" includepathDelimiter="-I">
+        <command type="ASM" includepathDelimiter="-I" dpath="${ASM_DPATH}"
+             libpath="${ASM_LIBPATH}" include="${ASM_INCLUDEPATH}">
           <includepath path="${WORKSPACE_DIR}"/>
           <includepath path="${MODULE_DIR}"/>
           <includepath path="${MODULE_DIR}/${ARCH}"/>
           <EXTRA.INC/>
-  
+
           <argument value="${ASM_FLAGS}"/>
           <EXTRA.ARG/>
-          <!-- <argument value="-o ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/> -->
           <OutputFile File="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
-  
-          <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+
+          <fileset casesensitive="on" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
         </command>
       </cc>
-  
-      <!--
-        for library generation later
-        -->
-      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
     </sequential>
   </macrodef>
-  
-  <!--
-    [Build.Ia32.Makefile,Build.Ipf.Makefile,Build.Ebc.Makefile]
-    [Build.Ia32.Custom_Makefile,Build.Ipf.Custom_Makefile,Build.Ebc.Custom_Makefile]
-    -->
-  <macrodef name="Build_Custom_Build">
-    <attribute name="FILEPATH"/>
-    <attribute name="FILENAME"/>
-    <attribute name="FILEEXT" default="c"/>
 
-    <element name="EXTRA.INC" optional="yes"/>
-    <element name="EXTRA.ARG" optional="yes"/>
+
+  <!--
+    Library
+  -->
+  <macrodef name="Build_Library">
+    <attribute name="FILENAME" />
+    <attribute name="FILEEXT" default="obj"/>
 
     <sequential>
+      <var name="FILE_BASENAME" value="@{FILENAME}" />
+      <var name="FILE_PATH" value="." />
+      <mkdir dir="${BIN_DIR}"/>
+
+      <if>
+        <equals arg1="${OBJECTS}" arg2="" trim="true"/>
+        <then>
+          <fail message="No object files"/>
+        </then>
+      </if>
 
+      <OnDependency>
+        <sourcefiles>
+          <fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}" />
+        </sourcefiles>
+        <targetfiles>
+          <file name="${BIN_DIR}/@{FILENAME}.lib"/>
+        </targetfiles>
+
+        <sequential>
+          <cc userdefine="on">
+            <command type="SLINK" cmd="${SLINK}" family="${SLINK_FAMILY}"
+                outputFile="${BIN_DIR}/@{FILENAME}.lib" dpath="${SLINK_DPATH}"
+                libpath="${SLINK_LIBPATH}" include="${SLINK_INCLUDEPATH}">
+              <argument value="${SLINK_FLAGS}"/>
+
+              <fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}"/>
+            </command>
+          </cc>
+        </sequential>
+      </OnDependency>
     </sequential>
   </macrodef>
 
   <!--
     Unicode -> .sdb
     -->
-  <macrodef name="Build_Unicode">
+  <macrodef name="Build_UNI">
     <attribute name="FILEPATH"/>
     <attribute name="FILENAME"/>
     <attribute name="FILEEXT" default="uni"/>
@@ -480,10 +591,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
     <sequential>
       <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>
+      <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep"
+                TargetFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.sdb">
+        <input file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+        <EXTRA.INC/>
+      </makedeps>
 
       <OnDependency>
         <sourcefiles>
-          <file name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+          <file listfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep"/>
         </sourcefiles>
         <targetfiles>
           <file name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.sdb"/>
@@ -492,9 +608,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <sequential>
           <strgather commandtype="parse" newdatabase="true">
             <database name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.sdb"/>
-            <includepath path="${WORKSPACE_DIR}"/>
-            <includepath path="${MODULE_DIR}"/>
-            <includepath path="${MODULE_DIR}/${ARCH}"/>
             <EXTRA.INC/>
             <EXTRA.ARG/>
             <inputfile name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
@@ -502,7 +615,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </sequential>
       </OnDependency>
 
-      <bl name="SDB_FILES" value="${SDB_FILES}, ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.sdb"/>
+      <var name="SDB_FILES" value="${SDB_FILES}, ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.sdb"/>
     </sequential>
   </macrodef>
 
@@ -518,6 +631,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>
 
     <sequential>
+      <var name="FILE_BASENAME" value="@{FILENAME}" />
+      <var name="FILE_PATH" value="@{FILEPATH}" />
       <OnDependency>
         <sourcefiles>
           <file list="${SDB_FILES}"/>
@@ -526,7 +641,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <targetfiles>
           <file name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.sdb"/>
         </targetfiles>
-        
+
         <sequential>
           <strgather commandtype="scan" outputdatabase="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.sdb" verbose="read">
             <skipext name=".uni"/>
@@ -546,7 +661,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           <file name="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}Strings.hpk"/>
           <file name="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}Strings.c"/>
         </targetfiles>
-        
+
         <sequential>
           <strgather basename="@{FILENAME}Strings" commandtype="dump"
                      outputdefines="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}StrDefs.h"
@@ -560,35 +675,43 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <OnDependency>
         <sourcefiles>
           <file name="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}Strings.c"/>
+          <file ListFile="${DEST_DIR_OUTPUT}/AutoGen.h.dep"/>
         </sourcefiles>
         <targetfiles>
           <file name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Strings.obj"/>
         </targetfiles>
-        
+
         <sequential>
           <cc userdefine="on">
-            <command type="CC" workdir="${DEST_DIR_OUTPUT}" includepathDelimiter="-I">
-              <includepath path="${WORKSPACE_DIR}"/>
-              <includepath path="${MODULE_DIR}"/>
-              <includepath path="${MODULE_DIR}/${ARCH}"/>
-
+            <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}"
+                     includepathDelimiter="-I" dpath="${CC_DPATH}"
+                     libpath="${CC_LIBPATH}" include="${CC_INCLUDEPATH}"
+                     outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Strings.obj">
               <argument value="${CC_FLAGS}"/>
-              <OutputFile value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Strings.obj"/>
-
-              <fileset casesensitive="off" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}Strings.c"/>
+              <EXTRA.INC />
+              <fileset casesensitive="on" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}Strings.c"/>
             </command>
           </cc>
         </sequential>
       </OnDependency>
 
-      <bl name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Strings.obj"/>
+      <!-- Since fileset can't scan file start with ./, remove ./ in previous. -->
+      <if>
+        <equals arg1="@{FILEPATH}" arg2="." />
+        <then>
+          <var name="OBJECTS" value="${OBJECTS} @{FILENAME}Strings.obj" />
+        </then>
+        <else>
+          <var name="OBJECTS" value="${OBJECTS} @{FILEPATH}/@{FILENAME}Strings.obj" />
+        </else>
+      </if>
     </sequential>
   </macrodef>
 
   <!--
     Vfr
     -->
-  <macrodef name="Build_Vfr">
+  <macrodef name="Build_VFR">
     <attribute name="FILEPATH"/>
     <attribute name="FILENAME"/>
     <attribute name="FILEEXT" default="vfr"/>
@@ -599,167 +722,472 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <sequential>
       <mkdir dir="${DEST_DIR_DEBUG}/@{FILEPATH}"/>
 
-      <if>
-        <available type="file" file="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
-        <then>
-          <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep">
-            <input file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
-            <!-- <input file="${DEST_DIR_DEBUG}/AutoGen.h"/> -->
-            <includepath path="${WORKSPACE_DIR}"/>
-            <includepath path="${MODULE_DIR}"/>
-            <includepath path="${MODULE_DIR}/${ARCH}"/>
-            <EXTRA.INC/>
-          </makedeps>
-        </then>
-      </if>
+      <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep"
+                TargetFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj">
+        <input file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+        <EXTRA.INC/>
+      </makedeps>
 
       <OnDependency>
         <sourcefiles>
           <file listfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep"/>
+          <file ListFile="${DEST_DIR_OUTPUT}/AutoGen.h.dep"/>
         </sourcefiles>
         <targetfiles>
           <file name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
         </targetfiles>
 
         <sequential>
-          <vfrcompile createIfrBinFile="on" createListFile="on" outPutDir="${DEST_DIR_DEBUG}/@{FILEPATH}" vfrFile="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}">
-            <includepath path="${WORKSPACE_DIR}"/>
-            <includepath path="${MODULE_DIR}"/>
-            <includepath path="${MODULE_DIR}/${ARCH}"/>
+          <!-- if "TOOLCHIAN FAMILY" is "GCC", it should point the ouput file for preprocess compiler -->
+          <if>
+            <equals arg1="${CC_FAMILY}" arg2="GCC"/>
+            <then>
+              <cc userdefine="on">
+                <command type="PP" cmd="${PP}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${PP_FAMILY}"
+                         dpath="${PP_DPATH}" libpath="${PP_LIBPATH}" include="${PP_INCLUDEPATH}">
+                  <argument value="${VFRPP_FLAGS} -o ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.i"/>
+                  <!-- Output file of the preprocess -->
+                  <EXTRA.INC/>
+                  <fileset casesensitive="on" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+                </command>
+              </cc>
+            </then>
+            <else>
+              <cc userdefine="on">
+                <command type="PP" cmd="${PP}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${PP_FAMILY}"
+                         dpath="${PP_DPATH}" libpath="${PP_LIBPATH}" include="${PP_INCLUDEPATH}">
+                  <argument value="${VFRPP_FLAGS}"/>
+                  <!-- Output file of the preprocess -->
+                  <EXTRA.INC/>
+                  <fileset casesensitive="on" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+                </command>
+              </cc>
+            </else>
+          </if>
+
+          <vfrcompile createIfrBinFile="on" createListFile="on" outPutDir="${DEST_DIR_DEBUG}/@{FILEPATH}" vfrFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.i">
             <EXTRA.INC/>
           </vfrcompile>
-    
+
           <cc userdefine="on">
-            <command type="CC" workdir="${DEST_DIR_OUTPUT}" includepathDelimiter="-I">
-              <includepath path="${WORKSPACE_DIR}"/>
-              <includepath path="${MODULE_DIR}"/>
-              <includepath path="${MODULE_DIR}/${ARCH}"/>
+            <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}"
+                     includepathDelimiter="-I" family="${CC_FAMILY}" dpath="${CC_DPATH}"
+                     libpath="${CC_LIBPATH}" include="${CC_INCLUDEPATH}"
+                     outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" >
               <argument value="${CC_FLAGS}"/>
-              <OutputFile value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
+              <EXTRA.INC/>
               <EXTRA.ARG/>
-    
-              <fileset casesensitive="off" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.c"/>
+              <fileset casesensitive="on" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.c"/>
             </command>
           </cc>
-    
-          <delete file="@{FILENAME}.i"/>
         </sequential>
       </OnDependency>
-      <bl name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
+      <!-- Since fileset can't scan file start with ./, remove ./ in previous. -->
+      <if>
+        <equals arg1="@{FILEPATH}" arg2="." />
+        <then>
+          <var name="OBJECTS" value="${OBJECTS} @{FILENAME}.obj" />
+        </then>
+        <else>
+          <var name="OBJECTS" value="${OBJECTS} @{FILEPATH}/@{FILENAME}.obj" />
+        </else>
+      </if>
     </sequential>
   </macrodef>
 
-<!--############################################################################
-  Build Sections
-#############################################################################-->
   <!--
-    DLL
+      Build the real mode ASM file
     -->
-  <macrodef name="GenDll">
+  <macrodef name="Build_RealAsm">
     <attribute name="FILEPATH"/>
     <attribute name="FILENAME"/>
-    <attribute name="FILEEXT"/>
+    <attribute name="FILEEXT" default="asm"/>
 
-    <element name="LIB.ARG" optional="yes"/>
-    <element name="LINK.ARG" optional="yes"/>
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
 
     <sequential>
       <OnDependency>
         <sourcefiles>
-          <file list="${OBJECTS}"/>
-          <file list="${LIBS}"/>
+          <file name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
         </sourcefiles>
         <targetfiles>
-          <file name="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.dll"/>
+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.cat"/>
         </targetfiles>
 
         <sequential>
-          <cc userdefine="on">
-            <command type="LINK">
-              <argument value="${LINK_FLAGS}"/>
-              <libset libs="${LIBS}"/>
-              <LINK.ARG/>
-              <EntryPoint value="_ModuleEntryPoint"/>
-              <map value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.map"/>
-              <pdb value="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.pdb"/>
-              <OutputFile value="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.dll"/>
-              <FileList dir="" files="${OBJECTS}"/>
-            </command>
-          </cc>
+          <exec dir="${DEST_DIR_OUTPUT}" executable="${ASM}" failonerror="true">
+            <arg line="/nologo /omf ${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT} /Bl${ASMLINK} ${ASMLINK_FLAGS}"/>
+          </exec>
+          <concat destfile="${DEST_DIR_OUTPUT}/@{FILENAME}.cat" binary="yes">
+            <filelist dir="${MODULE_DIR}" files="Blank2.pad"/>
+            <filelist dir="${DEST_DIR_OUTPUT}" files="@{FILENAME}.com"/>
+          </concat>
         </sequential>
       </OnDependency>
     </sequential>
   </macrodef>
 
   <!--
-    EFI
+      Build Asl table file
     -->
-  <macrodef name="GenEfi">
+  <macrodef name="Build_ASL">
     <attribute name="FILEPATH"/>
     <attribute name="FILENAME"/>
-    <attribute name="FILEEXT" default="dll"/>
+    <attribute name="FILEEXT" default="asl"/>
 
-    <sequential>
-      <OnDependency>
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <sequential>
+      <mkdir dir="${DEST_DIR_OUTPUT}"/>
+
+      <OnDependency>
         <sourcefiles>
-          <file name="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+          <file name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
         </sourcefiles>
         <targetfiles>
-          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.efi"/>
+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.sec"/>
         </targetfiles>
 
         <sequential>
-          <fwimage componenttype="${COMPONENT_TYPE}" outImage="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" 
-                   peImage="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" time="0"/>
+          <cc userdefine="on">
+            <command type="PP" cmd="${PP}" workdir="${DEST_DIR_OUTPUT}" family="${PP_FAMILY}"
+                dpath="${PP_DPATH}" libpath="${PP_LIBPATH}" include="${PP_INCLUDEPATH}">
+              <argument value="${APP_FLAGS}"/>
+              <EXTRA.INC/>
+              <fileset casesensitive="on" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+            </command>
+          </cc>
+
+          <exec dir="${DEST_DIR_OUTPUT}" executable="${ASL}" failonerror="true" outputproperty="ASL_OUTPUT">
+            <arg line="${DEST_DIR_OUTPUT}/@{FILENAME}.i"/>
+          </exec>
+
+          <if>
+            <or>
+              <contains string="${ASL_OUTPUT}" substring="Supports ACPI Specification Revision 2.0"/>
+              <contains string="${ASL_OUTPUT}" substring="Supports ACPI Specification Revision 1.0"/>
+            </or>
+            <then>
+              <fail message="Current Asl tool not support Acpi Spec 3.0. Pls update your Asl compiler."/>
+            </then>
+          </if>
+
+          <EFI_SECTION_RAW FILEPATH="." FILENAME="@{FILENAME}" FILEEXT="aml"/>
+
         </sequential>
       </OnDependency>
     </sequential>
   </macrodef>
 
-<!--
-  EFI_SECTION_FREEFORM_SUBTYPE_GUID
-  EFI_SECTION_VERSION
-  EFI_SECTION_USER_INTERFACE
-  EFI_SECTION_DXE_DEPEX
-  EFI_SECTION_PEI_DEPEX
-  EFI_SECTION_PE32
-  EFI_SECTION_PIC
-  EFI_SECTION_TE
-  EFI_SECTION_RAW
-  EFI_SECTION_COMPRESSION
-  EFI_SECTION_GUID_DEFINED
-  EFI_SECTION_COMPATIBILITY16
-  EFI_SECTION_FIRMWARE_VOLUME_IMAGE
+  <!--
+      Build Asl table c file
+    -->
+  <macrodef name="Build_CCASL">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="c"/>
+
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <sequential>
+      <mkdir dir="${DEST_DIR_OUTPUT}"/>
+
+      <OnDependency>
+        <sourcefiles>
+          <file name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+        </sourcefiles>
+        <targetfiles>
+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.sec"/>
+        </targetfiles>
+
+        <sequential>
+
+          <cc userdefine="on">
+            <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}"
+                outputFile="${DEST_DIR_OUTPUT}/@{FILENAME}.obj" dpath="${CC_DPATH}"
+                libpath="${CC_LIBPATH}" include="${CC_INCLUDEPATH}">
+              <EXTRA.INC/>
+              <argument value="${CC_FLAGS}"/>
+              <EXTRA.ARG/>
+              <fileset casesensitive="on" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+            </command>
+          </cc>
+
+          <cc userdefine="on">
+            <command type="DLINK" cmd="${DLINK}" family="${DLINK_FAMILY}"
+                     outputFile="${DEST_DIR_OUTPUT}/@{FILENAME}.exe" dpath="${DLINK_DPATH}" >
+              <argument value="${SLINK_FLAGS}"/>
+              <fileset casesensitive="on" file="${DEST_DIR_OUTPUT}/@{FILENAME}.obj"/>
+            </command>
+          </cc>
+
+          <genacpitable inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.exe" outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.acpi" />
+
+          <EFI_SECTION_RAW FILEPATH="." FILENAME="@{FILENAME}" FILEEXT="acpi"/>
+        </sequential>
+      </OnDependency>
+    </sequential>
+  </macrodef>
+ <!--
+      Build ACPI Bin File
+    -->
+  <macrodef name="Build_ACPIBIN">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="bin"/>
+
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <sequential>
+      <mkdir dir="${DEST_DIR_OUTPUT}"/>
+
+      <OnDependency>
+        <sourcefiles>
+          <file name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+        </sourcefiles>
+        <targetfiles>
+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.sec"/>
+        </targetfiles>
+
+        <sequential>
+          <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" tofile="${DEST_DIR_OUTPUT}/@{FILENAME}.acpi" />
+
+          <exec executable="attrib">
+            <arg line="-r ${DEST_DIR_OUTPUT}/@{FILENAME}.acpi"/>
+          </exec>
+
+          <EFI_SECTION_RAW FILEPATH="." FILENAME="@{FILENAME}" FILEEXT="acpi"/>
+        </sequential>
+      </OnDependency>
+    </sequential>
+  </macrodef>
+
+  <!--
+    DUMMY - for skipping the source file which should not be built
+    -->
+  <macrodef name="Build_DUMMY">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT"/>
+
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <sequential>
+      <!--echo message="Ignoring ${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" level="info" /-->
+    </sequential>
+  </macrodef>
+
+  <!--
+    Generate efi file
+    -->
+  <macrodef name="GenEfi">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="efi"/>
+
+    <element name="LIB.ARG" optional="yes"/>
+    <element name="LINK.ARG" optional="yes"/>
+
+    <sequential>
+      <var name="FILE_BASENAME" value="@{FILENAME}" />
+      <var name="FILE_PATH" value="@{FILEPATH}" />
+      <OnDependency>
+        <sourcefiles>
+          <file list="${LIBS}"/>
+          <fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}" />
+        </sourcefiles>
+        <targetfiles>
+          <file name="${DEST_DIR_DEBUG}/@{FILENAME}.efi"/>
+        </targetfiles>
+
+        <sequential>
+          <!-- Generate a temporary lib file for object files -->
+          <cc userdefine="on">
+            <command type="SLINK" cmd="${SLINK}" family="${SLINK_FAMILY}" dpath="${SLINK_DPATH}"
+                outputFile="${DEST_DIR_OUTPUT}/@{FILENAME}Local.lib"
+                libpath="${SLINKLIBPATH}" include="${SLINK_INCLUDEPATH}">
+              <argument value="${SLINK_FLAGS}"/>
+
+              <fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}"/>
+            </command>
+          </cc>
+
+          <!-- Link the temporary lib file with dependent libraries -->
+          <cc userdefine="on">
+            <command type="DLINK" cmd="${DLINK}" family="${DLINK_FAMILY}"
+                     outputFile="${DEST_DIR_DEBUG}/@{FILENAME}.dll" dpath="${DLINK_DPATH}"
+                     libpath="${DLINK_LIBPATH}" include="${DLINK_INCLUDEPATH}">
+              <argument value="${DLINK_FLAGS}"/>
+              <libset libs="${DEST_DIR_OUTPUT}/@{FILENAME}Local.lib ${LIBS} ${DLINK_SPATH}"/>
+              <LINK.ARG/>
+            </command>
+          </cc>
+
+          <!-- Convert the dll file to efi file -->
+          <fwimage componentType="${MODULE_TYPE}" outImage="${DEST_DIR_OUTPUT}/@{FILENAME}.efi"
+                   peImage="${DEST_DIR_DEBUG}/@{FILENAME}.dll" time="0"/>
+
+          <!-- Copy the efi file to BIN and OUTPUT directory -->
+          <copy file="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" tofile="${BIN_DIR}/@{FILENAME}.efi" />
+          <copy file="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" tofile="${DEST_DIR_DEBUG}/@{FILENAME}.efi" />
+          <if>
+            <available file="${DEST_DIR_DEBUG}/@{FILENAME}.map" />
+            <then>
+              <copy file="${DEST_DIR_DEBUG}/@{FILENAME}.map" tofile="${BIN_DIR}/@{FILENAME}.map" />
+            </then>
+          </if>
+        </sequential>
+      </OnDependency>
+    </sequential>
+  </macrodef>
+
+  <!--
+    Binary
+    -->
+  <macrodef name="Build_Binary">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="bin"/>
+
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <sequential>
+      <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"
+            tofile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.bin"/>
+    </sequential>
+  </macrodef>
+
+  <!--
+    Microcode
+   -->
+  <macrodef name="Build_MICROCODE">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="TXT"/>
+
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <sequential>
+      <mkdir dir="${TARGET_DIR}/Microcode"/>
+      <flashmap MCIFile="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" MCOFILE="${TARGET_DIR}/Microcode/@{FILENAME}.bin"/>
+    </sequential>
+  </macrodef>
+
+  <!--
+    Graphics (bmp, ...)
+    -->
+  <macrodef name="Build_BMP">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="bmp"/>
+
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <sequential>
+      <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"
+            tofile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.bin"/>
+    </sequential>
+  </macrodef>
+
+  <!--
+    build EFI file
   -->
+  <macrodef name="Build_EFI">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="efi"/>
+
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <sequential>
+      <mkdir dir="${MODULE_DIR}/@{FILEPATH}" />
+      <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"
+        tofile="${DEST_DIR_OUTPUT}/${BASE_NAME}.efi"/>
+    </sequential>
+  </macrodef>
+
   <!--
-    EFI_SECTION_PE32
+    Build macro for Apriori
+  -->
+  <macrodef name="Build_Apriori">
+    <attribute name="FILEPATH" default="."/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="apr"/>
+    <attribute name="GUID"/>
+
+    <sequential>
+      <mkdir dir="${FV_DIR}/Apriori" />
+      <gensection inputfile="${FV_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"
+                  outputfile="${FV_DIR}/Apriori/@{FILENAME}.sec"
+                  sectiontype="EFI_SECTION_RAW"/>
+
+      <genffsfile BaseName="@{FILENAME}" ffsATTRIBCHECKSUM="TRUE" ffsFILETYPE="EFI_FV_FILETYPE_FREEFORM"
+                  fileGuid="@{GUID}" moduleType="BASE" outputDir="${FV_DIR}">
+        <sectFile fileName="${FV_DIR}/Apriori/@{FILENAME}.sec"/>
+      </genffsfile>
+
+    </sequential>
+  </macrodef>
+
+<!--############################################################################
+  Build Sections
+#############################################################################-->
+  <!--
+    EFI_SECTION_TE
     -->
-  <macrodef name="EFI_SECTION_PE32">
+
+  <macrodef name="EFI_SECTION_TE">
     <attribute name="FILEPATH"/>
     <attribute name="FILENAME"/>
-    <attribute name="FILEEXT" default="" />
+    <attribute name="FILEEXT" default="efi" />
 
     <element name="PRE.PROCESS" optional="yes"/>
     <element name="POST.PROCESS" optional="yes"/>
 
     <sequential>
-      <PRE.PROCESS/>
+      <OnDependency>
+        <sourcefiles>
+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.efi"/>
+        </sourcefiles>
+        <targetfiles>
+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.tes"/>
+        </targetfiles>
 
-      <if>
-        <not>
-          <equals arg1="${OBJECTS}" arg2=""/>
-        </not>
+        <sequential>
+          <PRE.PROCESS/>
 
-        <then>
-          <GenDll FILEPATH="." FILENAME="@{FILENAME}" FILEEXT="">
-            <LIB.ARG></LIB.ARG>
-            <LINK.ARG></LINK.ARG>
-          </GenDll>
-    
-          <GenEfi FILEPATH="." FILENAME="@{FILENAME}" FILEEXT="dll"/>
-        </then>
-      </if>
+          <genteimage Dump="false" Verbose="false" OutputDir="" OutputFile="${DEST_DIR_OUTPUT}/@{FILENAME}.te" InputFile="${DEST_DIR_OUTPUT}/@{FILENAME}.efi"/>
+          <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.te"
+                      outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.tes"
+                      sectiontype="EFI_SECTION_TE"/>
+
+          <POST.PROCESS/>
+        </sequential>
+      </OnDependency>
+    </sequential>
+  </macrodef>
+
+  <!--
+    EFI_SECTION_PE32
+    -->
+  <macrodef name="EFI_SECTION_PE32">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="efi"/>
+
+    <element name="PRE.PROCESS" optional="yes"/>
+    <element name="POST.PROCESS" optional="yes"/>
 
+    <sequential>
       <OnDependency>
         <sourcefiles>
           <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.efi"/>
@@ -769,11 +1197,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </targetfiles>
 
         <sequential>
-          <copy file="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" tofile="${BIN_DIR}/@{FILENAME}.efi" />
-          <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" 
-                      outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.pe32" 
+          <PRE.PROCESS/>
+
+          <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.efi"
+                      outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.pe32"
                       sectiontype="EFI_SECTION_PE32"/>
-    
+
           <POST.PROCESS/>
         </sequential>
       </OnDependency>
@@ -800,7 +1229,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
         <then>
           <PRE.PROCESS/>
-          <gensection outputfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.ver" 
+          <gensection outputfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.ver"
                       versionnum="@{VERSION}"
                       sectiontype="EFI_SECTION_VERSION"/>
           <POST.PROCESS/>
@@ -830,7 +1259,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <then>
           <PRE.PROCESS/>
           <gensection interfacestring="@{UI}"
-                      outputfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.ui" 
+                      outputfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.ui"
                       sectiontype="EFI_SECTION_USER_INTERFACE"/>
           <POST.PROCESS/>
         </then>
@@ -838,24 +1267,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </sequential>
   </macrodef>
 
-  <!--
-    EFI_SECTION_FREEFORM_SUBTYPE_GUID
-    <macrodef name="EFI_SECTION_FREEFORM_SUBTYPE_GUID">
-      <attribute name="FILEPATH"/>
-      <attribute name="FILENAME"/>
-      <attribute name="FILEEXT" default=""/>
-  
-      <element name="EXTRA.INC" optional="yes"/>
-      <element name="EXTRA.ARG" optional="yes"/>
-  
-      <sequential>
-        <gensection inputfile="" 
-                    outputfile="" 
-                    sectiontype="EFI_SECTION_FREEFORM_SUBTYPE_GUID"/>
-      </sequential>
-    </macrodef>
-    -->
-
   <!--
     EFI_SECTION_DXE_DEPEX
     -->
@@ -871,18 +1282,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <PRE.PROCESS/>
 
       <if>
-        <available type="file" file="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}.depex"/>
+        <available type="file" file="${DEST_DIR_OUTPUT}/@{FILENAME}.depex"/>
         <then>
           <OnDependency>
             <sourcefiles>
-              <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}.depex"/>
+              <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.depex"/>
             </sourcefiles>
             <targetfiles>
               <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.dpx"/>
             </targetfiles>
             <sequential>
-              <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}.depex" 
-                          outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.dpx" 
+              <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.depex"
+                          outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.dpx"
                           sectiontype="EFI_SECTION_DXE_DEPEX"/>
             </sequential>
           </OnDependency>
@@ -916,23 +1327,23 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <sequential>
       <PRE.PROCESS/>
       <if>
-        <available type="file" file="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}.depex"/>
+        <available type="file" file="${DEST_DIR_OUTPUT}/@{FILENAME}.depex"/>
         <then>
           <OnDependency>
             <sourcefiles>
-              <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}.depex"/>
+              <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.depex"/>
             </sourcefiles>
             <targetfiles>
               <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.dpx"/>
             </targetfiles>
 
             <sequential>
-              <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}.depex" 
-                          outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.dpx" 
+              <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.depex"
+                          outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.dpx"
                           sectiontype="EFI_SECTION_PEI_DEPEX"/>
             </sequential>
           </OnDependency>
-          
+
         </then>
         <else>
           <if>
@@ -949,41 +1360,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </sequential>
   </macrodef>
 
-  <!--
-    EFI_SECTION_PIC
-    <macrodef name="EFI_SECTION_PIC">
-      <attribute name="FILEPATH"/>
-      <attribute name="FILENAME"/>
-      <attribute name="FILEEXT" default=""/>
-  
-      <element name="EXTRA.INC" optional="yes"/>
-      <element name="EXTRA.ARG" optional="yes"/>
-  
-      <sequential>
-        <gensection inputfile="${BIN_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" 
-                    outputfile="${BIN_DIR}/@{FILENAME}.pe32" 
-                    sectiontype="EFI_SECTION_PIC"/>
-      </sequential>
-    </macrodef>
-    -->
-
-  <!--
-    EFI_SECTION_TE
-    <macrodef name="EFI_SECTION_TE">
-      <attribute name="FILEPATH"/>
-      <attribute name="FILENAME"/>
-      <attribute name="FILEEXT" default=""/>
-  
-      <element name="EXTRA.INC" optional="yes"/>
-      <element name="EXTRA.ARG" optional="yes"/>
-  
-      <sequential>
-        <gensection inputfile="${BIN_DIR}/@{FILENAME}.@{FILEEXT}" 
-                    outputfile="${BIN_DIR}/@{FILENAME}.pe32" 
-                    sectiontype="EFI_SECTION_PE32"/>
-      </sequential>
-    </macrodef>
-    -->
 
   <!--
     EFI_SECTION_RAW
@@ -999,7 +1375,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <sequential>
       <OnDependency>
         <sourcefiles>
-          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}"/>
+          <file name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
         </sourcefiles>
         <targetfiles>
           <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.sec"/>
@@ -1007,8 +1383,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
         <sequential>
           <PRE.PROCESS/>
-          <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}" 
-                      outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.sec" 
+          <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"
+                      outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.sec"
                       sectiontype="EFI_SECTION_RAW"/>
           <POST.PROCESS/>
         </sequential>
@@ -1017,66 +1393,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </macrodef>
 
   <!--
-    EFI_SECTION_COMPRESSION
-    <macrodef name="EFI_SECTION_COMPRESSION">
-      <attribute name="FILEPATH"/>
-      <attribute name="FILENAME"/>
-      <attribute name="FILEEXT" default=""/>
-  
-      <element name="EXTRA.INC" optional="yes"/>
-      <element name="EXTRA.ARG" optional="yes"/>
-  
-      <sequential>
-        <gensection inputfile="${BIN_DIR}/@{FILENAME}.@{FILEEXT}" 
-                    outputfile="${BIN_DIR}/@{FILENAME}.pe32" 
-                    sectiontype="EFI_SECTION_PE32"/>
-      </sequential>
-    </macrodef>
-    -->
-
-  <!--
-    EFI_SECTION_GUID_DEFINED
-    <macrodef name="EFI_SECTION_GUID_DEFINED">
-      <attribute name="FILEPATH"/>
-      <attribute name="FILENAME"/>
-      <attribute name="FILEEXT" default=""/>
-  
-      <element name="EXTRA.INC" optional="yes"/>
-      <element name="EXTRA.ARG" optional="yes"/>
-  
-      <sequential>
-        <gensection inputfile="${BIN_DIR}/@{FILENAME}.@{FILEEXT}" 
-                    outputfile="${BIN_DIR}/@{FILENAME}.pe32" 
-                    sectiontype="EFI_SECTION_PE32"/>
-      </sequential>
-    </macrodef>
-    -->
-
-  <!--
-    EFI_SECTION_COMPATIBILITY16
-    <macrodef name="EFI_SECTION_COMPATIBILITY16">
-      <attribute name="FILEPATH"/>
-      <attribute name="FILENAME"/>
-      <attribute name="FILEEXT" default=""/>
-  
-      <element name="EXTRA.INC" optional="yes"/>
-      <element name="EXTRA.ARG" optional="yes"/>
-  
-      <sequential>
-        <gensection inputfile="${BIN_DIR}/@{FILENAME}.@{FILEEXT}" 
-                    outputfile="${BIN_DIR}/@{FILENAME}.pe32" 
-                    sectiontype="EFI_SECTION_PE32"/>
-      </sequential>
-    </macrodef>
-  
+    EFI_SECTION_RAW_SEC
     -->
-  <!--
-    EFI_SECTION_FIRMWARE_VOLUME_IMAGE
-    -->
-  <macrodef name="EFI_SECTION_FIRMWARE_VOLUME_IMAGE">
+  <macrodef name="EFI_SECTION_RAW_SEC">
     <attribute name="FILEPATH"/>
     <attribute name="FILENAME"/>
-    <attribute name="FILEEXT" default="fv"/>
+    <attribute name="FILEEXT" default="cat"/>
 
     <element name="PRE.PROCESS" optional="yes"/>
     <element name="POST.PROCESS" optional="yes"/>
@@ -1084,22 +1406,21 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <sequential>
       <OnDependency>
         <sourcefiles>
-          <file name="${FV_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+          <file name="${DEST_DIR_OUTPUT}/ResetVec.@{FILEEXT}"/>
+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.te"/>
         </sourcefiles>
         <targetfiles>
-          <file name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}fv.sec"/>
+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.sec"/>
         </targetfiles>
 
         <sequential>
           <PRE.PROCESS/>
-    
-          <copy file="${FV_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" 
-                tofile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" 
-                overwrite="true"/>
-          <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" 
-                      outputfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}fv.sec" 
-                      sectiontype="EFI_SECTION_FIRMWARE_VOLUME_IMAGE"/>
-    
+          <secfixup secexefile="${DEST_DIR_OUTPUT}/@{FILENAME}.te" resetvectorDatafile="${DEST_DIR_OUTPUT}/ResetVec.@{FILEEXT}"
+                   outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.bin"/>
+
+          <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.bin"
+                      outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.sec"
+                      sectiontype="EFI_SECTION_RAW"/>
           <POST.PROCESS/>
         </sequential>
       </OnDependency>
@@ -1107,51 +1428,39 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </macrodef>
 
   <!--
-    Binary
+    EFI_SECTION_FIRMWARE_VOLUME_IMAGE
     -->
-  <macrodef name="Build_Binary">
+  <macrodef name="EFI_SECTION_FIRMWARE_VOLUME_IMAGE">
     <attribute name="FILEPATH"/>
     <attribute name="FILENAME"/>
-    <attribute name="FILEEXT" default="bin"/>
+    <attribute name="FILEEXT" default="fv"/>
 
-    <element name="EXTRA.INC" optional="yes"/>
-    <element name="EXTRA.ARG" optional="yes"/>
+    <element name="PRE.PROCESS" optional="yes"/>
+    <element name="POST.PROCESS" optional="yes"/>
 
     <sequential>
-      <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" 
-            tofile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.bin"/>
-    </sequential>
-  </macrodef>
+      <OnDependency>
+        <sourcefiles>
+          <file name="${FV_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+        </sourcefiles>
+        <targetfiles>
+          <file name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}fv.sec"/>
+        </targetfiles>
 
-  <!--
-    Graphics (bmp, ...)
-    -->
-  <macrodef name="Build_Graphics">
-    <attribute name="FILEPATH"/>
-    <attribute name="FILENAME"/>
-    <attribute name="FILEEXT" default="bmp"/>
+        <sequential>
+          <PRE.PROCESS/>
 
-    <element name="EXTRA.INC" optional="yes"/>
-    <element name="EXTRA.ARG" optional="yes"/>
+          <copy file="${FV_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"
+                tofile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"
+                overwrite="true"/>
+          <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"
+                      outputfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}fv.sec"
+                      sectiontype="EFI_SECTION_FIRMWARE_VOLUME_IMAGE"/>
 
-    <sequential>
-      <mkdir dir="${MODULE_DIR}/@{FILEPATH}" /> 
-      <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" 
-            tofile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.bin"/>
+          <POST.PROCESS/>
+        </sequential>
+      </OnDependency>
     </sequential>
   </macrodef>
-  <macrodef name="Build_EFI">
-    <attribute name="FILEPATH"/>
-    <attribute name="FILENAME"/>
-    <attribute name="FILEEXT" default="efi"/>
-
-    <element name="EXTRA.INC" optional="yes"/>
-    <element name="EXTRA.ARG" optional="yes"/>
 
-    <sequential>
-      <mkdir dir="${MODULE_DIR}/@{FILEPATH}" /> 
-      <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" 
-        tofile="${DEST_DIR_OUTPUT}/${BASE_NAME}.efi"/>
-    </sequential>
-  </macrodef>
 </project>