From 0b8fc154a7566cf0cab0de3ffeb3a7c6725efe3d Mon Sep 17 00:00:00 2001
From: jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 12 Oct 2006 12:09:28 +0000
Subject: [PATCH] Added APP tool command to solve the pre-processing issue in
 IPF assembly and dxs file

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1732 6f19259b-4bc3-4df7-8a09-765794883524
---
 Tools/Conf/BuildMacro.xml     | 4 ++--
 Tools/Conf/tools_def.template | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 71814450e5..25632730fe 100644
--- 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.
 
         <sequential>
           <cc userdefine="on">
-            <command type="PP" cmd="${PP}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${PP_FAMILY}" dpath="${PP_DPATH}">
+            <command type="PP" cmd="${APP}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${APP_FAMILY}" dpath="${APP_DPATH}">
               <EXTRA.INC.1/>
-              <argument value="${PP_FLAGS}"/>
+              <argument value="${APP_FLAGS}"/>
               <fileset casesensitive="on" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
             </command>
           </cc>
diff --git a/Tools/Conf/tools_def.template b/Tools/Conf/tools_def.template
index 69600cba69..6cb197fb7d 100644
--- 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
 ##################
 *_MYTOOLS_IPF_*_FAMILY      = MSFT
 
+*_MYTOOLS_IPF_APP_NAME      = cl.exe
 *_MYTOOLS_IPF_PP_NAME       = cl.exe
 *_MYTOOLS_IPF_CC_NAME       = cl.exe
 *_MYTOOLS_IPF_SLINK_NAME    = lib.exe
@@ -435,6 +436,7 @@ RELEASE_MYTOOLS_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /O
 *_MYTOOLS_IPF_ASM_EXT       = .s
 *_MYTOOLS_IPF_*_PATH        = C:\WINDDK\3790.1830\bin\win64\x86
 
+*_MYTOOLS_IPF_APP_FLAGS     = /nologo /P /TC
 *_MYTOOLS_IPF_PP_FLAGS      = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h
 *_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
 *_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
-- 
2.39.2