Simplify the script. It now allows normal ant targets and flags to be passed straight...

[mirror_edk2.git] / EdkModulePkg / EdkModulePkg.fpd

diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index 8dd5c40ea7f79a450cef78bb8c930d06b011d679..e529128a51420049ed019b5fb16a79bdf11eeed5 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -4122,79 +4122,22 @@
       <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASM">\r
         "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32", "/Fl${DEST_DIR_OUTPUT}/${FILE_PATH}/${FILE_BASENAME}.lst"\r
       </Option>\r
-      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>\r
-      <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/P", "/TC" </Option>\r
+      <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>\r
+      <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/nologo", "/P", "/TC", "/FI${DEST_DIR_DEBUG}/AutoGen.h" </Option>\r
       <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL"> "/nologo" </Option>\r
       \r
-      <!-- MSFT tool chain options definition : X64 -->\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="CC">\r
-        "/nologo", "/X", "/W4", "/WX", "/Gy", "/c", "/Gs8192", "/GS-", "/D EFIx64"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="SLINK">\r
-        "/NOLOGO"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="DLINK">\r
-        "/NOLOGO", "/Machine:AMD64", "/ALIGN:32", "/DLL", "/NODEFAULTLIB", "/OPT:REF"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASM">\r
-        "/nologo", "/W3", "/WX", "/c", "/DEFI32"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASMLINK"> </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="PP">\r
-        "/P"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASL"> "/nologo" </Option>\r
-      \r
-      <!-- MSFT tool chain options definition : IPF -->\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="CC">\r
-        "/nologo", "/W4", "/WX", "/EHsc", "/Gy", "/c", "/GS-", "/D EFI64"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="SLINK"> "/NOLOGO" </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="DLINK">\r
-        "/NOLOGO", "/NODEFAULTLIB", "/IGNORE:4086", "/MAP", "/OPT:REF", "/MACHINE:IA64"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="ASM">\r
-        "-N us", "-X explicit", "-M ilp64", "-N so", "-W4"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="ASMLINK"> </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="PP"> "/P" </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="ASL"> "/nologo" </Option>\r
-      \r
-      <!-- INTC tool chain options definition : EBC -->\r
-      <Option ToolChainFamily="INTC" SupArchList="EBC" ToolCode="CC">\r
-        "-nologo", "-FAcs", "-c", "-W3", "-WX"\r
-      </Option>\r
-      <Option ToolChainFamily="INTC" SupArchList="EBC" ToolCode="SLINK">\r
-        "/lib", "/NOLOGO", "/MACHINE:EBC"\r
-      </Option>\r
-      <Option ToolChainFamily="INTC" SupArchList="EBC" ToolCode="DLINK">\r
-        "/NOLOGO", "/MACHINE:EBC", "/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER", "/OPT:REF", "/NODEFAULTLIB"\r
-      </Option>\r
-      <Option ToolChainFamily="INTC" SupArchList="EBC" ToolCode="PP"> "/P" </Option>\r
-        \r
       <!-- GCC tool chain options definition : IA32 -->\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="CC">\r
-        "-Os", "-fshort-wchar", "-fno-strict-aliasing", "-Wall", "-Werror", "-c"\r
+        "-Os", "-fshort-wchar", "-fno-strict-aliasing", "-Wall", "-Werror", "-c", "-include ${DEST_DIR_DEBUG}/AutoGen.h"\r
       </Option>\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASM"> "--warn" </Option>\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="SLINK"> </Option>\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="DLINK">\r
-        "-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols"\r
+        "-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols", "--entry ${ENTRYPOINT}"\r
       </Option>\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASMLINK"/>\r
-      <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E" </Option>\r
+      <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E", "-include ${DEST_DIR_DEBUG}/AutoGen.h" </Option>\r
 \r
-      <!-- BOB tool chain options definition : IA32 -->\r
-      <Option TagName="BOB" SupArchList="IA32" ToolCode="CC">\r
-        "-Os", "-fshort-wchar", "-fno-strict-aliasing", "-Wall", "-Werror", "-c"\r
-      </Option>\r
-      <Option TagName="BOB" SupArchList="IA32" ToolCode="ASM"> "--warn" </Option>\r
-      <Option TagName="BOB" SupArchList="IA32" ToolCode="SLINK"> </Option>\r
-      <Option TagName="BOB" SupArchList="IA32" ToolCode="DLINK">\r
-        "-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols"\r
-      </Option>\r
-      <Option TagName="BOB" SupArchList="IA32" ToolCode="ASMLINK"/>\r
-      <Option TagName="BOB" SupArchList="IA32" ToolCode="PP"> "-E" </Option>\r
     </Options>\r
     \r
          <Ffs FfsKey="APPLICATION">\r