Add support for DEBUG and RELEASE builds of this FPD file.

Remove all FLAG settings from this FPD file.  This functionality has moved into tools_def.txt

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

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index 255a1f6d487003065827844b4454f169b424094f..d1cb6817835f02d20bdb08a76e5965aa73e97418 100644 (file)
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -19,7 +19,7 @@
   </PlatformHeader>\r
   <PlatformDefinitions>\r
     <SupportedArchitectures>IA32</SupportedArchitectures>\r
   </PlatformHeader>\r
   <PlatformDefinitions>\r
     <SupportedArchitectures>IA32</SupportedArchitectures>\r

-    <BuildTargets>DEBUG</BuildTargets>\r
+    <BuildTargets>DEBUG RELEASE</BuildTargets>\r

     <IntermediateDirectories>UNIFIED</IntermediateDirectories>\r
     <OutputDirectory>Build/Nt32</OutputDirectory>\r
     <SkuInfo>\r
     <IntermediateDirectories>UNIFIED</IntermediateDirectories>\r
     <OutputDirectory>Build/Nt32</OutputDirectory>\r
     <SkuInfo>\r


@@ -589,8 +589,8 @@
         <FvBinding>FV_RECOVERY</FvBinding>\r
         <FfsFormatKey>PE32_PEIM</FfsFormatKey>\r
         <Options>\r
         <FvBinding>FV_RECOVERY</FvBinding>\r
         <FfsFormatKey>PE32_PEIM</FfsFormatKey>\r
         <Options>\r

-          <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">"/NODEFAULTLIB", "/LTCG", "/DLL", "/OPT:REF", "/EXPORT:InitializeDriver=_ModuleEntryPoint", "/IGNORE:4086", "/MAP", "/MACHINE:I386", "/NOLOGO", "/DEBUG", "/ENTRY:${ENTRYPOINT}", "/SUBSYSTEM:CONSOLE", "/MAP:${DEST_DIR_DEBUG}/${BASE_NAME}.map", "/PDB:${DEST_DIR_DEBUG}/${BASE_NAME}.pdb", "Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib"</Option>\r
-          <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">"/NODEFAULTLIB", "/LTCG", "/DLL", "/OPT:REF", "/EXPORT:InitializeDriver=_ModuleEntryPoint", "/IGNORE:4086", "/MAP", "/MACHINE:I386", "/NOLOGO", "/DEBUG", "/ENTRY:${ENTRYPOINT}", "/SUBSYSTEM:${SUBSYSTEM}", "/MAP:${DEST_DIR_DEBUG}/${BASE_NAME}.map", "/PDB:${DEST_DIR_DEBUG}/${BASE_NAME}.pdb", "Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib"</Option>\r
+          <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">"Kernel32.lib", "MSVCRTD.lib", "Gdi32.lib", "User32.lib", "Winmm.lib"</Option>\r
+          <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">"Kernel32.lib", "MSVCRTD.lib", "Gdi32.lib", "User32.lib", "Winmm.lib"</Option>\r

         </Options>\r
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
         </Options>\r
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r


@@ -1405,10 +1405,6 @@
       <ModuleSaBuildOptions>\r
         <FvBinding>FV_RECOVERY</FvBinding>\r
         <FfsFormatKey>DXE_CORE</FfsFormatKey>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>FV_RECOVERY</FvBinding>\r
         <FfsFormatKey>DXE_CORE</FfsFormatKey>\r

-        <Options>\r
-          <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="CC">"/nologo", "/W4", "/WX", "/GX", "/Gy", "/c", "/D EFI_MONOSHELL", "/D UNICODE", "/D EFI_DEBUG", "/D EFI_PEI_REPORT_STATUS_CODE_ON", "/Zi", "/D EFI32", "/DEFI_NT_EMULATOR", "/DNEW_PEI_HOBS", "/Odiyb2", "/GL", "/G7", "/Gy", "/FI${DEST_DIR_DEBUG}/AutoGen.h", "/Ob0"</Option>\r
-          <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="CC">"/nologo", "/W4", "/WX", "/GX", "/Gy", "/c", "/Od", "/D EFI_MONOSHELL", "/D UNICODE", "/D EFI_DEBUG", "/D EFI_PEI_REPORT_STATUS_CODE_ON", "/Zi", "/D EFI32", "/DEFI_NT_EMULATOR", "/DNEW_PEI_HOBS", "/GL", "/G7", "/Gy", "/FI${DEST_DIR_DEBUG}/AutoGen.h"</Option>\r
-        </Options>\r

       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="IA32" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" ModuleGuid="80CF7257-87AB-47f9-A3FE-D50B76D89541">\r
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="IA32" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" ModuleGuid="80CF7257-87AB-47f9-A3FE-D50B76D89541">\r


@@ -1510,9 +1506,6 @@
       <ModuleSaBuildOptions>\r
         <FvBinding>FV_RECOVERY</FvBinding>\r
         <FfsFormatKey>BS_DRIVER</FfsFormatKey>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>FV_RECOVERY</FvBinding>\r
         <FfsFormatKey>BS_DRIVER</FfsFormatKey>\r

-        <Options>\r
-          <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="CC">"/FAcs", "/Fa${DEST_DIR_OUTPUT}/", "/nologo", "/W4", "/WX", "/GX", "/Gy", "/c", "/O1", "/D EFI_MONOSHELL", "/D UNICODE", "/D EFI_DEBUG", "/D EFI_PEI_REPORT_STATUS_CODE_ON", "/Zi", "/D EFI32", "/DEFI_NT_EMULATOR", "/DNEW_PEI_HOBS", "/GL", "/G7", "/Gy", "/DSTRING_ARRAY_NAME=${BASE_NAME}Strings", "/FI${DEST_DIR_DEBUG}/AutoGen.h"</Option>\r
-        </Options>\r

       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="IA32" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" ModuleGuid="51C9F40C-5243-4473-B265-B3C8FFAFF9FA">\r
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="IA32" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" ModuleGuid="51C9F40C-5243-4473-B265-B3C8FFAFF9FA">\r


@@ -1678,10 +1671,6 @@
       <ModuleSaBuildOptions>\r
         <FvBinding>FV_RECOVERY</FvBinding>\r
         <FfsFormatKey>BS_DRIVER</FfsFormatKey>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>FV_RECOVERY</FvBinding>\r
         <FfsFormatKey>BS_DRIVER</FfsFormatKey>\r

-        <Options>\r
-          <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="CC">"/nologo", "/W4", "/WX", "/GX", "/Gy", "/c", "/D EFI_MONOSHELL", "/D UNICODE", "/D EFI_DEBUG", "/D EFI_PEI_REPORT_STATUS_CODE_ON", "/Zi", "/D EFI32", "/DEFI_NT_EMULATOR", "/DNEW_PEI_HOBS", "/Odiyb2", "/GL", "/G7", "/Gy", "/DSTRING_ARRAY_NAME=${BASE_NAME}Strings", "/FI${DEST_DIR_DEBUG}/AutoGen.h"</Option>\r
-          <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="CC">"/nologo", "/W4", "/WX", "/GX", "/Gy", "/c", "/Od", "/D EFI_MONOSHELL", "/D UNICODE", "/D EFI_DEBUG", "/D EFI_PEI_REPORT_STATUS_CODE_ON", "/Zi", "/D EFI32", "/DEFI_NT_EMULATOR", "/DNEW_PEI_HOBS", "/Odiyb2", "/GL", "/G7", "/Gy", "/DSTRING_ARRAY_NAME=${BASE_NAME}Strings", "/FI${DEST_DIR_DEBUG}/AutoGen.h"</Option>\r
-        </Options>\r

       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="154CAB4A-52B5-46CD-99C3-4368ABBACFFD">\r
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="154CAB4A-52B5-46CD-99C3-4368ABBACFFD">\r


@@ -2550,8 +2539,8 @@
         <FvBinding>FV_RECOVERY</FvBinding>\r
         <FfsFormatKey>BS_DRIVER</FfsFormatKey>\r
         <Options>\r
         <FvBinding>FV_RECOVERY</FvBinding>\r
         <FfsFormatKey>BS_DRIVER</FfsFormatKey>\r
         <Options>\r

-          <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">"/NODEFAULTLIB", "/LTCG", "/DLL", "/OPT:REF", "/EXPORT:InitializeDriver=_ModuleEntryPoint", "/IGNORE:4086", "/MAP", "/MACHINE:I386", "/NOLOGO", "/DEBUG", "/ENTRY:${ENTRYPOINT}", "/SUBSYSTEM:CONSOLE", "/MAP:${DEST_DIR_DEBUG}/${BASE_NAME}.map", "/PDB:${DEST_DIR_DEBUG}/${BASE_NAME}.pdb", "libc.lib Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib"</Option>\r
-          <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">"/NODEFAULTLIB", "/LTCG", "/DLL", "/OPT:REF", "/EXPORT:InitializeDriver=_ModuleEntryPoint", "/IGNORE:4086", "/MAP", "/MACHINE:I386", "/NOLOGO", "/DEBUG", "/ENTRY:${ENTRYPOINT}", "/SUBSYSTEM:${SUBSYSTEM}", "/MAP:${DEST_DIR_DEBUG}/${BASE_NAME}.map", "/PDB:${DEST_DIR_DEBUG}/${BASE_NAME}.pdb", "libc.lib Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib"</Option>\r
+          <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">"Kernel32.lib", "MSVCRTD.lib", "Gdi32.lib", "User32.lib", "Winmm.lib"</Option>\r
+          <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">"Kernel32.lib", "MSVCRTD.lib", "Gdi32.lib", "User32.lib", "Winmm.lib"</Option>\r

         </Options>\r
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
         </Options>\r
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r


@@ -6979,22 +6968,8 @@
   </DynamicPcdBuildDefinitions>\r
   <BuildOptions>\r
     <Options>\r
   </DynamicPcdBuildDefinitions>\r
   <BuildOptions>\r
     <Options>\r

-      <!--MSFT tool chain options definition : IA32-->\r
-      <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="CC">"/nologo", "/W4", "/WX", "/GX", "/Gy", "/c", "/D EFI_MONOSHELL", "/D UNICODE", "/D EFI_DEBUG", "/D EFI_PEI_REPORT_STATUS_CODE_ON", "/Zi", "/D EFI32", "/DEFI_NT_EMULATOR", "/DNEW_PEI_HOBS", "/Odiyb2", "/GL", "/G7", "/Gy", "/DSTRING_ARRAY_NAME=${BASE_NAME}Strings", "/FI${DEST_DIR_DEBUG}/AutoGen.h"</Option>\r
-      <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="SLINK">"/NOLOGO", "/LTCG"</Option>\r
-      <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">"/NODEFAULTLIB", "/LTCG", "/DLL", "/OPT:REF", "/EXPORT:InitializeDriver=_ModuleEntryPoint", "/IGNORE:4086", "/MAP", "/MACHINE:I386", "/NOLOGO", "/DEBUG", "/ENTRY:${ENTRYPOINT}", "/SUBSYSTEM:${SUBSYSTEM}", "/MAP:${DEST_DIR_DEBUG}/${BASE_NAME}.map", "/PDB:${DEST_DIR_DEBUG}/${BASE_NAME}.pdb"</Option>\r
-      <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASM">"/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32", "/DDEBUG", "/Cx", "/Zd", "/Zi", "/DEFI_NT_EMULATOR", "/Fl${DEST_DIR_OUTPUT}/${FILE_PATH}/${FILE_BASENAME}.lst"</Option>\r
-      <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>\r
-      <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP">"/nologo", "/P", "/TC", "/FI${DEST_DIR_DEBUG}/AutoGen.h"</Option>\r
-      <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL">"/nologo"</Option>\r
-      <!--MSFT tool chain options definition : IA32-->\r
-      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="CC">"/nologo", "/W4", "/WX", "/GX", "/Gy", "/c", "/Od", "/D EFI_MONOSHELL", "/D UNICODE", "/D EFI_DEBUG", "/D EFI_PEI_REPORT_STATUS_CODE_ON", "/Zi", "/D EFI32", "/DEFI_NT_EMULATOR", "/DNEW_PEI_HOBS", "/GL", "/G7", "/Gy", "/DSTRING_ARRAY_NAME=${BASE_NAME}Strings", "/FI${DEST_DIR_DEBUG}/AutoGen.h"</Option>\r
-      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="SLINK">"/NOLOGO", "/LTCG"</Option>\r
-      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">"/NODEFAULTLIB", "/LTCG", "/DLL", "/OPT:REF", "/EXPORT:InitializeDriver=_ModuleEntryPoint", "/IGNORE:4086", "/MAP", "/MACHINE:I386", "/NOLOGO", "/DEBUG", "/ENTRY:${ENTRYPOINT}", "/SUBSYSTEM:CONSOLE", "/MAP:${DEST_DIR_DEBUG}/${BASE_NAME}.map", "/PDB:${DEST_DIR_DEBUG}/${BASE_NAME}.pdb"</Option>\r
-      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASM">"/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32", "/DDEBUG", "/Cx", "/Zd", "/Zi", "/DEFI_NT_EMULATOR", "/Fl${DEST_DIR_OUTPUT}/${FILE_PATH}/${FILE_BASENAME}.lst"</Option>\r
-      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>\r
-      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP">"/nologo", "/P", "/TC", "/FI${DEST_DIR_DEBUG}/AutoGen.h"</Option>\r
-      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL">"/nologo"</Option>\r
+      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">/EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096</Option>\r
+      <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">/ALIGN:4096</Option>\r

     </Options>\r
     <Ffs FfsKey="APPLICATION">\r
       <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_APPLICATION"/>\r
     </Options>\r
     <Ffs FfsKey="APPLICATION">\r
       <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_APPLICATION"/>\r