Remove #include STRING_DEFINES_FILE from C file. Using ForceInclude to include ${BASE_NAME}StrDefs.h header file. Remove flag /DSTRING_DEFINED_FILE=${BASE_NAME}StrDefs.h. Move flags /DSTRING_ARRAY_NAME=${BASE_NAME}Strings from FPDs to BuildMacro since this flag will be used only unicode files exist.

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

3 files changed, 8 insertions, 11 deletions

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.c b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.c
index 8633327263..3d4be68f53 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.c
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.c
@@ -24,12 +24,6 @@ Abstract:
 

 #include "CpuDriver.h"

 

-//

-// This is the VFR compiler generated header file which defines the

-// string identifiers.

-//

-#include STRING_DEFINES_FILE

-

 #define EFI_CPU_DATA_MAXIMUM_LENGTH 0x100

 

 EFI_STATUS

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index 4842aee9cb..74bd11bdd2 100644
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -1542,7 +1542,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <FfsFormatKey>BS_DRIVER</FfsFormatKey>
         <Options>
           <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", "/DSTRING_DEFINES_FILE=\"${BASE_NAME}StrDefs.h\"", "/FI${DEST_DIR_DEBUG}/AutoGen.h"
+            "/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", "/FI${DEST_DIR_DEBUG}/AutoGen.h"
           </Option>
         </Options>
       </ModuleSaBuildOptions>
@@ -1712,10 +1712,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <FfsFormatKey>BS_DRIVER</FfsFormatKey>
         <Options>
           <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", "/DSTRING_DEFINES_FILE=\"${BASE_NAME}StrDefs.h\"", "/FI${DEST_DIR_DEBUG}/AutoGen.h"
+            "/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"
           </Option> 
           <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", "/DSTRING_DEFINES_FILE=\"${BASE_NAME}StrDefs.h\"", "/FI${DEST_DIR_DEBUG}/AutoGen.h"
+            "/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", "/FI${DEST_DIR_DEBUG}/AutoGen.h"
           </Option>  
         </Options> 
       </ModuleSaBuildOptions>
@@ -7102,7 +7102,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Options>
       <!-- MSFT tool chain options definition : IA32 -->
       <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", "/DSTRING_DEFINES_FILE=\"${BASE_NAME}StrDefs.h\"", "/FI${DEST_DIR_DEBUG}/AutoGen.h"
+        "/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"
       </Option>
       <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="SLINK"> "/NOLOGO", "/LTCG"</Option>
       <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">
@@ -7117,7 +7117,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       
       <!-- MSFT tool chain options definition : IA32 -->
       <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", "/DSTRING_DEFINES_FILE=\"${BASE_NAME}StrDefs.h\"", "/FI${DEST_DIR_DEBUG}/AutoGen.h"
+        "/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>
       <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="SLINK"> "/NOLOGO", "/LTCG"</Option>
       <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">
diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 59dc7c2469..0b7f53757a 100644
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -586,6 +586,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </cc>

         </sequential>

       </OnDependency>

+      <!-- The Module contain Unicode file need those flags -->

+      <var name="CC_FLAGS" value="${CC_FLAGS} /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/${BASE_NAME}StrDefs.h" />

+      

       <!-- Since fileset can't scan file start with ./, remove ./ in previous. -->

       <if>

         <equals arg1="@{FILEPATH}" arg2="." />