1 files changed, 8 insertions, 8 deletions
diff --git a/MdePkg/MdePkg-All-Archs.fpd b/MdePkg/MdePkg-All-Archs.fpd
index 8c507e5468..6837147de5 100644
--- a/MdePkg/MdePkg-All-Archs.fpd
+++ b/MdePkg/MdePkg-All-Archs.fpd
@@ -2556,8 +2556,8 @@
       <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASM">
         "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32", "/Fl${DEST_DIR_OUTPUT}/${FILE_PATH}/${FILE_BASENAME}.lst"
       </Option>
-      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>
-      <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/P", "/TC" </Option>
+      <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>
+      <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/nologo", "/P", "/TC", "/FI${DEST_DIR_DEBUG}/AutoGen.h", "/FI${DEST_DIR_DEBUG}/AutoGen.h" </Option>
       <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL"> "/nologo" </Option>
       
       <!-- MSFT tool chain options definition : X64 -->
@@ -2575,7 +2575,7 @@
       </Option>
       <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASMLINK"> </Option>
       <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="PP">
-        "/P", "/TC"
+        "/nologo", "/P", "/TC", "/FI${DEST_DIR_DEBUG}/AutoGen.h"
       </Option>
       <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASL"> "/nologo" </Option>
       
@@ -2591,7 +2591,7 @@
         "-N us", "-X explicit", "-M ilp64", "-N so", "-W4"
       </Option>
       <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="ASMLINK"> </Option>
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="PP"> "/P", "/TC" </Option>
+      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="PP"> "/nologo", "/P", "/TC" </Option>
       <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="ASL"> "/nologo" </Option>
       
       <!-- INTEL tool chain options definition : EBC -->
@@ -2604,11 +2604,11 @@
       <Option ToolChainFamily="INTEL" SupArchList="EBC" ToolCode="DLINK">
         "/NOLOGO", "/MACHINE:EBC", "/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER", "/OPT:REF", "/NODEFAULTLIB", "/ENTRY:${ENTRYPOINT}", "/SUBSYSTEM:${SUBSYSTEM}"
       </Option>
-      <Option ToolChainFamily="INTEL" SupArchList="EBC" ToolCode="PP"> "-P", "-TC" </Option>
+      <Option ToolChainFamily="INTEL" SupArchList="EBC" ToolCode="PP"> "-nologo", "-P", "-TC" </Option>
         
       <!-- GCC tool chain options definition : IA32 -->
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="CC">
-        "-Os", "-fshort-wchar", "-fno-strict-aliasing", "-Wall", "-Werror", "-c"
+        "-Os", "-fshort-wchar", "-fno-strict-aliasing", "-Wall", "-Werror", "-c", "-include ${DEST_DIR_DEBUG}/AutoGen.h"
       </Option>
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASM"> "--warn" </Option>
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="SLINK"> </Option>
@@ -2616,7 +2616,7 @@
         "-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols"
       </Option>
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASMLINK"/>
-      <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E" </Option>
+      <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E", "-include ${DEST_DIR_DEBUG}/AutoGen.h" </Option>
 
       <!-- BOB tool chain options definition : IA32 -->
       <Option TagName="BOB" SupArchList="IA32" ToolCode="CC">
@@ -2781,4 +2781,4 @@
 	  
     <Sections />
   </BuildOptions>
-</PlatformSurfaceArea>
-\ No newline at end of file
+</PlatformSurfaceArea>