Added APP tool command to solve the pre-processing issue in IPF assembly and dxs...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1732 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 71814450e532cb9b266fa9857052cef43fef195a..25632730fe56d74916b9b4199678685abb711dc8 100644 (file)
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -443,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

diff --git a/Tools/Conf/tools_def.template b/Tools/Conf/tools_def.template
index 69600cba695f1249c1502ea39e534115cd2a85d1..6cb197fb7d48fbcb0b62b64727111fd3f06c761d 100644 (file)
--- a/Tools/Conf/tools_def.template
+++ b/Tools/Conf/tools_def.template
@@ -423,6 +423,7 @@ RELEASE_MYTOOLS_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /O
 ##################\r
 *_MYTOOLS_IPF_*_FAMILY      = MSFT\r
 \r
+*_MYTOOLS_IPF_APP_NAME      = cl.exe\r
 *_MYTOOLS_IPF_PP_NAME       = cl.exe\r
 *_MYTOOLS_IPF_CC_NAME       = cl.exe\r
 *_MYTOOLS_IPF_SLINK_NAME    = lib.exe\r
@@ -435,6 +436,7 @@ RELEASE_MYTOOLS_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /O
 *_MYTOOLS_IPF_ASM_EXT       = .s\r
 *_MYTOOLS_IPF_*_PATH        = C:\WINDDK\3790.1830\bin\win64\x86\r
 \r
+*_MYTOOLS_IPF_APP_FLAGS     = /nologo /P /TC\r
 *_MYTOOLS_IPF_PP_FLAGS      = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h\r
 *_MYTOOLS_IPF_CC_FLAGS      = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /D EFI64 /O1i /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h\r
 *_MYTOOLS_IPF_PCH_FLAGS     = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /D EFI64 /O1i /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC\r