Make Logo build following standard build process instead of customize build.

[mirror_edk2.git] / Tools / Conf / BuildMacro.xml

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 85118fb73faad5e828bdbd0aabe3dc5551df9597..0eb9c5742c6cfc8e01197a799ab16029c9a53001 100644 (file)
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -22,7 +22,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <var name="SDB_FILES" value="" />\r
 \r
       <if>\r
-        <isset property="PCH"/>\r
+        <and>\r
+          <isset property="PCH"/>\r
+          <not>\r
+            <equals arg1="${PCH}" arg2=""/>\r
+          </not>\r
+        </and>\r
         <then>\r
           <if>\r
             <available type="file" file="${DEST_DIR_OUTPUT}/AutoGen.h.gch"/>\r
@@ -438,9 +443,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
         <sequential>\r
           <cc userdefine="on">\r
-            <command type="PP" cmd="${PP}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${PP_FAMILY}" dpath="${PP_DPATH}">\r
+            <command type="PP" cmd="${APP}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${APP_FAMILY}" dpath="${APP_DPATH}">\r
               <EXTRA.INC.1/>\r
-              <argument value="${PP_FLAGS}"/>\r
+              <argument value="${APP_FLAGS}"/>\r
               <fileset casesensitive="on" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
             </command>\r
           </cc>\r
@@ -1156,6 +1161,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             tofile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.bin"/>\r
     </sequential>\r
   </macrodef>\r
+  \r
   <!--\r
     Microcode\r
    -->\r
@@ -1176,7 +1182,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <!--\r
     Graphics (bmp, ...)\r
     -->\r
-  <macrodef name="Build_Graphics">\r
+  <macrodef name="Build_BMP">\r
     <attribute name="FILEPATH"/>\r
     <attribute name="FILENAME"/> \r
     <attribute name="FILEEXT" default="bmp"/>\r
@@ -1190,6 +1196,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             tofile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.bin"/>\r
     </sequential>\r
   </macrodef> \r
+\r
+  <!--\r
+    build EFI file\r
+  -->\r
   <macrodef name="Build_EFI">\r
     <attribute name="FILEPATH"/>\r
     <attribute name="FILENAME"/>\r