BaseTools: tools_def.txt to append new option in VFRPP flag

[edk2] [Patch] BaseTools: tools_def.txt to append new option in VFRPP flag

Posted by Yonghong Zhu 7 years, 7 months ago

tools_def.txt to append new option (/FI$(MODULE_NAME)ImgDefs.h) in VFRPP
flag.

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Conf/tools_def.template | 172 +++++++++++++++++++-------------------
 1 file changed, 86 insertions(+), 86 deletions(-)

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index ab4f936..b537abe 100755
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -802,11 +802,11 @@ DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G
 *_VS2003_IA32_RC_PATH               = DEF(VS2003_BIN)\rc.exe
 
       *_VS2003_IA32_MAKE_FLAGS      = /nologo
       *_VS2003_IA32_APP_FLAGS       = /nologo /E /TC
       *_VS2003_IA32_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
-      *_VS2003_IA32_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+      *_VS2003_IA32_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
   DEBUG_VS2003_IA32_CC_FLAGS        = /nologo /c /WX /W4 /Gs32768 /Gy /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Zi /Gm
 RELEASE_VS2003_IA32_CC_FLAGS        = /nologo /c /WX /W4 /Gs32768 /Gy /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX-
 NOOPT_VS2003_IA32_CC_FLAGS          = /nologo /c /WX /W4 /Gs32768 /Gy /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Zi /Gm /Od
 
   DEBUG_VS2003_IA32_ASM_FLAGS       = /nologo /c /WX /W3 /coff /Cx /Zd /Zi
@@ -836,11 +836,11 @@ NOOPT_VS2003_IA32_DLINK_FLAGS       = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE
 *_VS2003_EBC_RC_PATH                = DEF(VS2003_BIN)\rc.exe
 
 *_VS2003_EBC_MAKE_FLAGS             = /nologo
 *_VS2003_EBC_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h
 *_VS2003_EBC_CC_FLAGS               = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2003_EBC_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2003_EBC_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2003_EBC_SLINK_FLAGS            = /lib /NOLOGO /MACHINE:EBC
 *_VS2003_EBC_DLINK_FLAGS            = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 ####################################################################################
 #
@@ -880,11 +880,11 @@ NOOPT_VS2003_IA32_DLINK_FLAGS       = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE
 
 
       *_VS2003xASL_IA32_MAKE_FLAGS      = /nologo
       *_VS2003xASL_IA32_APP_FLAGS       = /nologo /E /TC
       *_VS2003xASL_IA32_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
-      *_VS2003xASL_IA32_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+      *_VS2003xASL_IA32_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
   DEBUG_VS2003xASL_IA32_CC_FLAGS        = /nologo /c /WX /W4 /Gs32768 /Gy /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Zi /Gm
 RELEASE_VS2003xASL_IA32_CC_FLAGS        = /nologo /c /WX /W4 /Gs32768 /Gy /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX-
 NOOPT_VS2003xASL_IA32_CC_FLAGS          = /nologo /c /WX /W4 /Gs32768 /Gy /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Zi /Gm /Od
 
   DEBUG_VS2003xASL_IA32_ASM_FLAGS       = /nologo /c /WX /W3 /coff /Cx /Zd /Zi
@@ -914,11 +914,11 @@ NOOPT_VS2003xASL_IA32_DLINK_FLAGS       = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OP
 *_VS2003xASL_EBC_RC_PATH                = DEF(VS2003_BIN)\rc.exe
 
 *_VS2003xASL_EBC_MAKE_FLAGS             = /nologo
 *_VS2003xASL_EBC_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h
 *_VS2003xASL_EBC_CC_FLAGS               = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2003xASL_EBC_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2003xASL_EBC_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2003xASL_EBC_SLINK_FLAGS            = /lib /NOLOGO /MACHINE:EBC
 *_VS2003xASL_EBC_DLINK_FLAGS            = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 ####################################################################################
 # Microsoft Visual Studio 2005
@@ -934,11 +934,11 @@ NOOPT_VS2003xASL_IA32_DLINK_FLAGS       = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OP
 *_VS2005_*_RC_PATH                = DEF(VS2005_BIN)\rc.exe
 
 *_VS2005_*_SLINK_FLAGS            = /NOLOGO /LTCG
 *_VS2005_*_APP_FLAGS              = /nologo /E /TC
 *_VS2005_*_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h
-*_VS2005_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2005_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2005_*_ASM16_PATH             = DEF(VS2005_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -1057,11 +1057,11 @@ NOOPT_VS2005_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF
 *_VS2005_EBC_DLINK_PATH          = DEF(EBC_BIN)\link.exe
 
 *_VS2005_EBC_MAKE_FLAGS          = /nologo
 *_VS2005_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2005_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2005_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2005_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2005_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2005_EBC_DLINK_FLAGS         = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 ####################################################################################
 #
@@ -1078,11 +1078,11 @@ NOOPT_VS2005_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF
 *_VS2005xASL_*_RC_PATH         = DEF(VS2005_BIN)\rc.exe
 
 *_VS2005xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
 *_VS2005xASL_*_APP_FLAGS       = /nologo /E /TC
 *_VS2005xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
-*_VS2005xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2005xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2005xASL_*_ASM16_PATH      = DEF(VS2005_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -1201,11 +1201,11 @@ NOOPT_VS2005xASL_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,
 *_VS2005xASL_EBC_DLINK_PATH          = DEF(EBC_BIN)\link.exe
 
 *_VS2005xASL_EBC_MAKE_FLAGS          = /nologo
 *_VS2005xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2005xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2005xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2005xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2005xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2005xASL_EBC_DLINK_FLAGS         = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 ####################################################################################
 #
@@ -1222,11 +1222,11 @@ NOOPT_VS2005xASL_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,
 *_VS2005x86_*_RC_PATH         = DEF(VS2005x86_BIN)\rc.exe
 
 *_VS2005x86_*_SLINK_FLAGS     = /NOLOGO /LTCG
 *_VS2005x86_*_APP_FLAGS       = /nologo /E /TC
 *_VS2005x86_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
-*_VS2005x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2005x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2005x86_*_ASM16_PATH      = DEF(VS2005x86_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -1345,11 +1345,11 @@ NOOPT_VS2005x86_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,I
 *_VS2005x86_EBC_DLINK_PATH          = DEF(EBC_BINx86)\link.exe
 
 *_VS2005x86_EBC_MAKE_FLAGS          = /nologo
 *_VS2005x86_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2005x86_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2005x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2005x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2005x86_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2005x86_EBC_DLINK_FLAGS         = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 ####################################################################################
 #
@@ -1366,11 +1366,11 @@ NOOPT_VS2005x86_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,I
 *_VS2005x86xASL_*_RC_PATH         = DEF(VS2005x86_BIN)\rc.exe
 
 *_VS2005x86xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
 *_VS2005x86xASL_*_APP_FLAGS       = /nologo /E /TC
 *_VS2005x86xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
-*_VS2005x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2005x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2005x86xASL_*_ASM16_PATH      = DEF(VS2005x86_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -1489,11 +1489,11 @@ NOOPT_VS2005x86xASL_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:R
 *_VS2005x86xASL_EBC_DLINK_PATH          = DEF(EBC_BINx86)\link.exe
 
 *_VS2005x86xASL_EBC_MAKE_FLAGS          = /nologo
 *_VS2005x86xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2005x86xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2005x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2005x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2005x86xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2005x86xASL_EBC_DLINK_FLAGS         = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -1511,11 +1511,11 @@ NOOPT_VS2005x86xASL_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:R
 *_VS2008_*_RC_PATH                = DEF(WINSDK_BIN)\rc.exe
 
 *_VS2008_*_SLINK_FLAGS            = /NOLOGO /LTCG
 *_VS2008_*_APP_FLAGS              = /nologo /E /TC
 *_VS2008_*_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h
-*_VS2008_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2008_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2008_*_ASM16_PATH             = DEF(VS2008_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -1635,11 +1635,11 @@ NOOPT_VS2008_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF
 *_VS2008_EBC_DLINK_PATH          = DEF(VS2008_BIN)\link.exe
 
 *_VS2008_EBC_MAKE_FLAGS          = /nologo
 *_VS2008_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2008_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2008_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2008_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2008_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2008_EBC_DLINK_FLAGS         = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -1657,11 +1657,11 @@ NOOPT_VS2008_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF
 *_VS2008xASL_*_RC_PATH         = DEF(WINSDK_BIN)\rc.exe
 
 *_VS2008xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
 *_VS2008xASL_*_APP_FLAGS       = /nologo /E /TC
 *_VS2008xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
-*_VS2008xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2008xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2008xASL_*_ASM16_PATH      = DEF(VS2008_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -1781,11 +1781,11 @@ NOOPT_VS2008xASL_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,
 *_VS2008xASL_EBC_DLINK_PATH          = DEF(VS2008_BIN)\link.exe
 
 *_VS2008xASL_EBC_MAKE_FLAGS          = /nologo
 *_VS2008xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2008xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2008xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2008xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2008xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2008xASL_EBC_DLINK_FLAGS         = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -1801,11 +1801,11 @@ NOOPT_VS2008xASL_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,
 
 *_VS2008x86_*_MAKE_FLAGS      = /nologo
 *_VS2008x86_*_SLINK_FLAGS     = /NOLOGO /LTCG
 *_VS2008x86_*_APP_FLAGS       = /nologo /E /TC
 *_VS2008x86_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
-*_VS2008x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2008x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2008x86_*_ASM16_PATH      = DEF(VS2008x86_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -1925,11 +1925,11 @@ NOOPT_VS2008x86_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,I
 *_VS2008x86_EBC_DLINK_PATH          = DEF(VS2008x86_BIN)\link.exe
 
 *_VS2008x86_EBC_MAKE_FLAGS          = /nologo
 *_VS2008x86_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2008x86_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2008x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2008x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2008x86_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2008x86_EBC_DLINK_FLAGS         = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -1944,11 +1944,11 @@ NOOPT_VS2008x86_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,I
 
 *_VS2008x86xASL_*_MAKE_FLAGS      = /nologo
 *_VS2008x86xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
 *_VS2008x86xASL_*_APP_FLAGS       = /nologo /E /TC
 *_VS2008x86xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
-*_VS2008x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2008x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2008x86xASL_*_ASM16_PATH      = DEF(VS2008x86_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -2068,11 +2068,11 @@ NOOPT_VS2008x86xASL_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:R
 *_VS2008x86xASL_EBC_DLINK_PATH          = DEF(VS2008x86_BIN)\link.exe
 
 *_VS2008x86xASL_EBC_MAKE_FLAGS          = /nologo
 *_VS2008x86xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2008x86xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2008x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2008x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2008x86xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2008x86xASL_EBC_DLINK_FLAGS         = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -2090,11 +2090,11 @@ NOOPT_VS2008x86xASL_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:R
 *_VS2010_*_RC_PATH                = DEF(WINSDK7_BIN)\rc.exe
 
 *_VS2010_*_SLINK_FLAGS            = /NOLOGO /LTCG
 *_VS2010_*_APP_FLAGS              = /nologo /E /TC
 *_VS2010_*_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h
-*_VS2010_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2010_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2010_*_ASM16_PATH             = DEF(VS2010_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -2214,11 +2214,11 @@ NOOPT_VS2010_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF
 *_VS2010_EBC_DLINK_PATH          = DEF(VS2010_BIN)\link.exe
 
 *_VS2010_EBC_MAKE_FLAGS          = /nologo
 *_VS2010_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2010_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2010_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2010_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2010_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2010_EBC_DLINK_FLAGS         = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -2236,11 +2236,11 @@ NOOPT_VS2010_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF
 *_VS2010xASL_*_RC_PATH         = DEF(WINSDK7_BIN)\rc.exe
 
 *_VS2010xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
 *_VS2010xASL_*_APP_FLAGS       = /nologo /E /TC
 *_VS2010xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
-*_VS2010xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2010xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2010xASL_*_ASM16_PATH      = DEF(VS2010_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -2360,11 +2360,11 @@ NOOPT_VS2010xASL_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,
 *_VS2010xASL_EBC_DLINK_PATH          = DEF(VS2010_BIN)\link.exe
 
 *_VS2010xASL_EBC_MAKE_FLAGS          = /nologo
 *_VS2010xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2010xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2010xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2010xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2010xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2010xASL_EBC_DLINK_FLAGS         = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -2380,11 +2380,11 @@ NOOPT_VS2010xASL_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,
 
 *_VS2010x86_*_MAKE_FLAGS      = /nologo
 *_VS2010x86_*_SLINK_FLAGS     = /NOLOGO /LTCG
 *_VS2010x86_*_APP_FLAGS       = /nologo /E /TC
 *_VS2010x86_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
-*_VS2010x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2010x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2010x86_*_ASM16_PATH      = DEF(VS2010x86_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -2504,11 +2504,11 @@ NOOPT_VS2010x86_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,I
 *_VS2010x86_EBC_DLINK_PATH          = DEF(VS2010x86_BIN)\link.exe
 
 *_VS2010x86_EBC_MAKE_FLAGS          = /nologo
 *_VS2010x86_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2010x86_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2010x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2010x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2010x86_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2010x86_EBC_DLINK_FLAGS         = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -2523,11 +2523,11 @@ NOOPT_VS2010x86_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,I
 
 *_VS2010x86xASL_*_MAKE_FLAGS      = /nologo
 *_VS2010x86xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
 *_VS2010x86xASL_*_APP_FLAGS       = /nologo /E /TC
 *_VS2010x86xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
-*_VS2010x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2010x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2010x86xASL_*_ASM16_PATH      = DEF(VS2010x86_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -2647,11 +2647,11 @@ NOOPT_VS2010x86xASL_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:R
 *_VS2010x86xASL_EBC_DLINK_PATH          = DEF(VS2010x86_BIN)\link.exe
 
 *_VS2010x86xASL_EBC_MAKE_FLAGS          = /nologo
 *_VS2010x86xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2010x86xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2010x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2010x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2010x86xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2010x86xASL_EBC_DLINK_FLAGS         = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -2669,11 +2669,11 @@ NOOPT_VS2010x86xASL_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:R
 *_VS2012_*_RC_PATH                = DEF(WINSDK71_BIN)\rc.exe
 
 *_VS2012_*_SLINK_FLAGS            = /NOLOGO /LTCG
 *_VS2012_*_APP_FLAGS              = /nologo /E /TC
 *_VS2012_*_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h
-*_VS2012_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2012_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2012_*_ASM16_PATH             = DEF(VS2012_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -2765,11 +2765,11 @@ NOOPT_VS2012_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2012_EBC_DLINK_PATH          = DEF(VS2012_BIN)\link.exe
 
 *_VS2012_EBC_MAKE_FLAGS          = /nologo
 *_VS2012_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2012_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2012_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2012_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2012_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2012_EBC_DLINK_FLAGS         = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -2787,11 +2787,11 @@ NOOPT_VS2012_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2012xASL_*_RC_PATH         = DEF(WINSDK71_BIN)\rc.exe
 
 *_VS2012xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
 *_VS2012xASL_*_APP_FLAGS       = /nologo /E /TC
 *_VS2012xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
-*_VS2012xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2012xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2012xASL_*_ASM16_PATH      = DEF(VS2012_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -2883,11 +2883,11 @@ NOOPT_VS2012xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE
 *_VS2012xASL_EBC_DLINK_PATH          = DEF(VS2012_BIN)\link.exe
 
 *_VS2012xASL_EBC_MAKE_FLAGS          = /nologo
 *_VS2012xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2012xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2012xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2012xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2012xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2012xASL_EBC_DLINK_FLAGS         = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -2903,11 +2903,11 @@ NOOPT_VS2012xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE
 
 *_VS2012x86_*_MAKE_FLAGS      = /nologo
 *_VS2012x86_*_SLINK_FLAGS     = /NOLOGO /LTCG
 *_VS2012x86_*_APP_FLAGS       = /nologo /E /TC
 *_VS2012x86_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
-*_VS2012x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2012x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2012x86_*_ASM16_PATH      = DEF(VS2012x86_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -2999,11 +2999,11 @@ NOOPT_VS2012x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2012x86_EBC_DLINK_PATH          = DEF(VS2012x86_BIN)\link.exe
 
 *_VS2012x86_EBC_MAKE_FLAGS          = /nologo
 *_VS2012x86_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2012x86_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2012x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2012x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2012x86_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2012x86_EBC_DLINK_FLAGS         = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -3018,11 +3018,11 @@ NOOPT_VS2012x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 
 *_VS2012x86xASL_*_MAKE_FLAGS      = /nologo
 *_VS2012x86xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
 *_VS2012x86xASL_*_APP_FLAGS       = /nologo /E /TC
 *_VS2012x86xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
-*_VS2012x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2012x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2012x86xASL_*_ASM16_PATH      = DEF(VS2012x86_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -3114,11 +3114,11 @@ NOOPT_VS2012x86xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT
 *_VS2012x86xASL_EBC_DLINK_PATH          = DEF(VS2012x86_BIN)\link.exe
 
 *_VS2012x86xASL_EBC_MAKE_FLAGS          = /nologo
 *_VS2012x86xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2012x86xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2012x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2012x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2012x86xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2012x86xASL_EBC_DLINK_FLAGS         = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 ####################################################################################
 #
@@ -3135,11 +3135,11 @@ NOOPT_VS2012x86xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT
 *_VS2013_*_RC_PATH                = DEF(WINSDK8_BIN)\rc.exe
 
 *_VS2013_*_SLINK_FLAGS            = /NOLOGO /LTCG
 *_VS2013_*_APP_FLAGS              = /nologo /E /TC
 *_VS2013_*_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h
-*_VS2013_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2013_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2013_*_ASM16_PATH             = DEF(VS2013_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -3231,11 +3231,11 @@ NOOPT_VS2013_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2013_EBC_DLINK_PATH          = DEF(VS2013_BIN)\link.exe
 
 *_VS2013_EBC_MAKE_FLAGS          = /nologo
 *_VS2013_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2013_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2013_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2013_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2013_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2013_EBC_DLINK_FLAGS         = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -3253,11 +3253,11 @@ NOOPT_VS2013_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2013xASL_*_RC_PATH         = DEF(WINSDK8_BIN)\rc.exe
 
 *_VS2013xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
 *_VS2013xASL_*_APP_FLAGS       = /nologo /E /TC
 *_VS2013xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
-*_VS2013xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2013xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2013xASL_*_ASM16_PATH      = DEF(VS2013_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -3349,11 +3349,11 @@ NOOPT_VS2013xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE
 *_VS2013xASL_EBC_DLINK_PATH          = DEF(VS2013_BIN)\link.exe
 
 *_VS2013xASL_EBC_MAKE_FLAGS          = /nologo
 *_VS2013xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2013xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2013xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2013xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2013xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2013xASL_EBC_DLINK_FLAGS         = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -3369,11 +3369,11 @@ NOOPT_VS2013xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE
 
 *_VS2013x86_*_MAKE_FLAGS      = /nologo
 *_VS2013x86_*_SLINK_FLAGS     = /NOLOGO /LTCG
 *_VS2013x86_*_APP_FLAGS       = /nologo /E /TC
 *_VS2013x86_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
-*_VS2013x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2013x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2013x86_*_ASM16_PATH      = DEF(VS2013x86_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -3465,11 +3465,11 @@ NOOPT_VS2013x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2013x86_EBC_DLINK_PATH          = DEF(VS2013x86_BIN)\link.exe
 
 *_VS2013x86_EBC_MAKE_FLAGS          = /nologo
 *_VS2013x86_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2013x86_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2013x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2013x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2013x86_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2013x86_EBC_DLINK_FLAGS         = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -3484,11 +3484,11 @@ NOOPT_VS2013x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 
 *_VS2013x86xASL_*_MAKE_FLAGS      = /nologo
 *_VS2013x86xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
 *_VS2013x86xASL_*_APP_FLAGS       = /nologo /E /TC
 *_VS2013x86xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
-*_VS2013x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2013x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2013x86xASL_*_ASM16_PATH      = DEF(VS2013x86_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -3580,11 +3580,11 @@ NOOPT_VS2013x86xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT
 *_VS2013x86xASL_EBC_DLINK_PATH          = DEF(VS2013x86_BIN)\link.exe
 
 *_VS2013x86xASL_EBC_MAKE_FLAGS          = /nologo
 *_VS2013x86xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2013x86xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2013x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2013x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2013x86xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2013x86xASL_EBC_DLINK_FLAGS         = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -3602,11 +3602,11 @@ NOOPT_VS2013x86xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT
 *_VS2015_*_RC_PATH                = DEF(WINSDK81_BIN)\rc.exe
 
 *_VS2015_*_SLINK_FLAGS            = /NOLOGO /LTCG
 *_VS2015_*_APP_FLAGS              = /nologo /E /TC
 *_VS2015_*_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h
-*_VS2015_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2015_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2015_*_ASM16_PATH             = DEF(VS2015_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -3698,11 +3698,11 @@ NOOPT_VS2015_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2015_EBC_DLINK_PATH          = DEF(VS2015_BIN)\link.exe
 
 *_VS2015_EBC_MAKE_FLAGS          = /nologo
 *_VS2015_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2015_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2015_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2015_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2015_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2015_EBC_DLINK_FLAGS         = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -3720,11 +3720,11 @@ NOOPT_VS2015_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2015xASL_*_RC_PATH         = DEF(WINSDK81_BIN)\rc.exe
 
 *_VS2015xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
 *_VS2015xASL_*_APP_FLAGS       = /nologo /E /TC
 *_VS2015xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
-*_VS2015xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2015xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2015xASL_*_ASM16_PATH      = DEF(VS2015_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -3816,11 +3816,11 @@ NOOPT_VS2015xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE
 *_VS2015xASL_EBC_DLINK_PATH          = DEF(VS2015_BIN)\link.exe
 
 *_VS2015xASL_EBC_MAKE_FLAGS          = /nologo
 *_VS2015xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2015xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2015xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2015xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2015xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2015xASL_EBC_DLINK_FLAGS         = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -3836,11 +3836,11 @@ NOOPT_VS2015xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE
 
 *_VS2015x86_*_MAKE_FLAGS      = /nologo
 *_VS2015x86_*_SLINK_FLAGS     = /NOLOGO /LTCG
 *_VS2015x86_*_APP_FLAGS       = /nologo /E /TC
 *_VS2015x86_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
-*_VS2015x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2015x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2015x86_*_ASM16_PATH      = DEF(VS2015x86_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -3932,11 +3932,11 @@ NOOPT_VS2015x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2015x86_EBC_DLINK_PATH          = DEF(VS2015x86_BIN)\link.exe
 
 *_VS2015x86_EBC_MAKE_FLAGS          = /nologo
 *_VS2015x86_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2015x86_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2015x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2015x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2015x86_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2015x86_EBC_DLINK_FLAGS         = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -3951,11 +3951,11 @@ NOOPT_VS2015x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 
 *_VS2015x86xASL_*_MAKE_FLAGS      = /nologo
 *_VS2015x86xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
 *_VS2015x86xASL_*_APP_FLAGS       = /nologo /E /TC
 *_VS2015x86xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
-*_VS2015x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2015x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_VS2015x86xASL_*_ASM16_PATH      = DEF(VS2015x86_BIN)\ml.exe
 
 ##################
 # ASL definitions
@@ -4047,11 +4047,11 @@ NOOPT_VS2015x86xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT
 *_VS2015x86xASL_EBC_DLINK_PATH          = DEF(VS2015x86_BIN)\link.exe
 
 *_VS2015x86xASL_EBC_MAKE_FLAGS          = /nologo
 *_VS2015x86xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
 *_VS2015x86xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2015x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2015x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_VS2015x86xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2015x86xASL_EBC_DLINK_FLAGS         = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -4070,11 +4070,11 @@ NOOPT_VS2015x86xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT
 *_DDK3790_*_RC_PATH         = DEF(WINDDK_BIN32)\rc.exe
 
 *_DDK3790_*_PP_FLAGS             = /nologo /E /TC /FIAutoGen.h
 *_DDK3790_*_APP_FLAGS            = /nologo /E /TC
 *_DDK3790_*_SLINK_FLAGS          = /nologo /LTCG
-*_DDK3790_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_DDK3790_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_DDK3790_*_ASM16_PATH      = DEF(WINDDK_BIN32)\ml.exe
 
 ##################
 # ASL definitions
@@ -4204,11 +4204,11 @@ NOOPT_DDK3790_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF
 *_DDK3790xASL_*_RC_PATH         = DEF(WINDDK_BIN32)\rc.exe
 
 *_DDK3790xASL_*_PP_FLAGS             = /nologo /E /TC /FIAutoGen.h
 *_DDK3790xASL_*_APP_FLAGS            = /nologo /E /TC
 *_DDK3790xASL_*_SLINK_FLAGS          = /nologo /LTCG
-*_DDK3790xASL_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_DDK3790xASL_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 
 *_DDK3790xASL_*_ASM16_PATH      = DEF(WINDDK_BIN32)\ml.exe
 
 ##################
 # ASL definitions
@@ -4356,11 +4356,11 @@ DEFINE GCC_IA32_X64_DLINK_FLAGS    = DEF(GCC_IA32_X64_DLINK_COMMON) --entry _$(I
 DEFINE GCC_IPF_DLINK_FLAGS         = -nostdlib -O2 --gc-sections --dll -static --entry $(IMAGE_ENTRY_POINT) --undefined $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
 DEFINE GCC_IPF_OBJCOPY_FLAGS       = -I elf64-ia64-little -O efi-bsdrv-ia64
 DEFINE GCC_IPF_SYMRENAME_FLAGS     = --redefine-sym memcpy=CopyMem
 DEFINE GCC_ASM_FLAGS               = -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h
 DEFINE GCC_PP_FLAGS                = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h
-DEFINE GCC_VFRPP_FLAGS             = -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
+DEFINE GCC_VFRPP_FLAGS             = -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h
 DEFINE GCC_ASLPP_FLAGS             = -x c -E -include AutoGen.h
 DEFINE GCC_ASLCC_FLAGS             = -x c
 DEFINE GCC_WINDRES_FLAGS           = -J rc -O coff
 DEFINE GCC_IA32_RC_FLAGS           = -I binary -O elf32-i386          -B i386    --rename-section .data=.hii
 DEFINE GCC_X64_RC_FLAGS            = -I binary -O elf64-x86-64        -B i386    --rename-section .data=.hii
@@ -5712,11 +5712,11 @@ NOOPT_CLANG38_X64_DLINK2_FLAGS     = DEF(GCC5_X64_DLINK2_FLAGS) -O0
 *_CYGGCCxASL_*_MAKE_FLAGS                 = /nologo
 *_CYGGCCxASL_*_PP_FLAGS                   = -E -x assembler-with-cpp -include AutoGen.h
 *_CYGGCCxASL_*_DLINK_FLAGS                = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20
 *_CYGGCCxASL_*_ASM_FLAGS                  = -c -x assembler -imacros AutoGen.h
 *_CYGGCCxASL_*_APP_FLAGS                  = -E -x assembler
-*_CYGGCCxASL_*_VFRPP_FLAGS                = -x c -E -P -DVFRCOMPILE --include $(MODULE_NAME)StrDefs.h
+*_CYGGCCxASL_*_VFRPP_FLAGS                = -x c -E -P -DVFRCOMPILE --include $(MODULE_NAME)StrDefs.h --include $(MODULE_NAME)ImgDefs.h
 
 ##################
 # ASL definitions
 ##################
 *_CYGGCCxASL_*_ASL_PATH        = DEF(WIN_ASL_BIN)
@@ -5810,11 +5810,11 @@ NOOPT_CLANG38_X64_DLINK2_FLAGS     = DEF(GCC5_X64_DLINK2_FLAGS) -O0
 *_ELFGCC_*_*_FAMILY                 = GCC
 *_ELFGCC_*_*_BUILDRULEFAMILY        = GCCLD
 *_ELFGCC_*_MAKE_PATH                = make
 
 *_ELFGCC_*_PP_FLAGS                     = -E -x assembler-with-cpp -include AutoGen.h
-*_ELFGCC_*_VFRPP_FLAGS                  = -x c -E -P -DVFRCOMPILE --include $(MODULE_NAME)StrDefs.h
+*_ELFGCC_*_VFRPP_FLAGS                  = -x c -E -P -DVFRCOMPILE --include $(MODULE_NAME)StrDefs.h --include $(MODULE_NAME)ImgDefs.h
 
 ##################
 # ASL definitions
 ##################
 *_ELFGCC_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)
@@ -5843,11 +5843,11 @@ NOOPT_CLANG38_X64_DLINK2_FLAGS     = DEF(GCC5_X64_DLINK2_FLAGS) -O0
 *_ELFGCC_IA32_SLINK_FLAGS           =
 *_ELFGCC_IA32_DLINK_FLAGS           = -melf_i386 -nostdlib --shared --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
 #*_ELFGCC_IA32_DLINK_FLAGS          = -melf_i386 -nostdlib -n -q -Ttext 0x220 --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT)
 *_ELFGCC_IA32_ASM_FLAGS             = -m32 -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h
 *_ELFGCC_IA32_PP_FLAGS              = -m32 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h
-*_ELFGCC_IA32_VFRPP_FLAGS           = -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
+*_ELFGCC_IA32_VFRPP_FLAGS           = -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h
 *_ELFGCC_IA32_RC_FLAGS              = DEF(GCC_IA32_RC_FLAGS)
 *_ELFGCC_IA32_OBJCOPY_FLAGS         =
 *_ELFGCC_IA32_NASM_FLAGS            = -f elf32
 
 ##################
@@ -5867,11 +5867,11 @@ NOOPT_CLANG38_X64_DLINK2_FLAGS     = DEF(GCC5_X64_DLINK2_FLAGS) -O0
 *_ELFGCC_X64_CC_FLAGS              = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-address -Wno-array-bounds -include AutoGen.h -D_EFI_P64
 *_ELFGCC_X64_DLINK_FLAGS           = -nostdlib --shared --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
 *_ELFGCC_X64_SLINK_FLAGS           =
 *_ELFGCC_X64_ASM_FLAGS             = -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h
 *_ELFGCC_X64_PP_FLAGS              = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h
-*_ELFGCC_X64_VFRPP_FLAGS           = -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
+*_ELFGCC_X64_VFRPP_FLAGS           = -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h
 *_ELFGCC_X64_RC_FLAGS              = DEF(GCC_X64_RC_FLAGS)
 *_ELFGCC_X64_NASM_FLAGS            = -f elf64
 
 ##################
 # IPF definitions
@@ -5890,11 +5890,11 @@ NOOPT_CLANG38_X64_DLINK2_FLAGS     = DEF(GCC5_X64_DLINK2_FLAGS) -O0
 *_ELFGCC_IPF_CC_FLAGS             = -Os -fshort-wchar -Wall -Werror -include AutoGen.h -D_EFI_P64
 *_ELFGCC_IPF_DLINK_FLAGS          = -nostdlib --shared --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
 *_ELFGCC_IPF_SLINK_FLAGS          =
 *_ELFGCC_IPF_ASM_FLAGS            = -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h
 *_ELFGCC_IPF_PP_FLAGS             = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h
-*_ELFGCC_IPF_VFRPP_FLAGS          = -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
+*_ELFGCC_IPF_VFRPP_FLAGS          = -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h
 *_ELFGCC_IPF_RC_FLAGS             = DEF(GCC_IPF_RC_FLAGS)
 
 ####################################################################################
 #
 # Intel(R) C++ Compiler Version 9.1
@@ -5908,11 +5908,11 @@ NOOPT_CLANG38_X64_DLINK2_FLAGS     = DEF(GCC5_X64_DLINK2_FLAGS) -O0
 
 *_ICC_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
 *_ICC_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
 
 *_ICC_*_MAKE_FLAGS                       = /nologo
-*_ICC_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_ICC_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_ICC_*_APP_FLAGS                        = /nologo /E /TC
 *_ICC_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
 
 *_ICC_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
 
@@ -6040,11 +6040,11 @@ NOOPT_ICC_IPF_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_ICC_EBC_DLINK_PATH            = DEF(EBC_BIN)\link.exe
 
 *_ICC_EBC_MAKE_FLAGS                 = /nologo
 *_ICC_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
 *_ICC_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_ICC_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_ICC_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_ICC_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
 *_ICC_EBC_DLINK_FLAGS                = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 ####################################################################################
 #
@@ -6059,11 +6059,11 @@ NOOPT_ICC_IPF_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 
 *_ICCxASL_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
 *_ICCxASL_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
 
 *_ICCxASL_*_MAKE_FLAGS                       = /nologo
-*_ICCxASL_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_ICCxASL_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_ICCxASL_*_APP_FLAGS                        = /nologo /E /TC
 *_ICCxASL_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
 
 *_ICCxASL_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
 
@@ -6192,11 +6192,11 @@ NOOPT_ICCxASL_IPF_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /LTCG /DLL
 *_ICCxASL_EBC_DLINK_PATH            = DEF(EBC_BIN)\link.exe
 
 *_ICCxASL_EBC_MAKE_FLAGS                 = /nologo
 *_ICCxASL_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
 *_ICCxASL_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_ICCxASL_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_ICCxASL_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_ICCxASL_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
 *_ICCxASL_EBC_DLINK_FLAGS                = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -6212,11 +6212,11 @@ NOOPT_ICCxASL_IPF_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /LTCG /DLL
 
 *_ICCx86_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
 *_ICCx86_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
 
 *_ICCx86_*_MAKE_FLAGS                       = /nologo
-*_ICCx86_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_ICCx86_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_ICCx86_*_APP_FLAGS                        = /nologo /E /TC
 *_ICCx86_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
 
 *_ICCx86_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
 
@@ -6345,11 +6345,11 @@ NOOPT_ICCx86_IPF_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /LTCG /DLL /
 *_ICCx86_EBC_DLINK_PATH            = DEF(EBC_BINx86)\link.exe
 
 *_ICCx86_EBC_MAKE_FLAGS                 = /nologo
 *_ICCx86_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
 *_ICCx86_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_ICCx86_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_ICCx86_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_ICCx86_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
 *_ICCx86_EBC_DLINK_FLAGS                = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -6365,11 +6365,11 @@ NOOPT_ICCx86_IPF_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /LTCG /DLL /
 
 *_ICCx86xASL_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
 *_ICCx86xASL_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
 
 *_ICCx86xASL_*_MAKE_FLAGS                       = /nologo
-*_ICCx86xASL_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_ICCx86xASL_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_ICCx86xASL_*_APP_FLAGS                        = /nologo /E /TC
 *_ICCx86xASL_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
 
 *_ICCx86ASL_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
 
@@ -6498,11 +6498,11 @@ NOOPT_ICCx86xASL_IPF_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /LTCG /D
 *_ICCx86xASL_EBC_DLINK_PATH            = DEF(EBC_BINx86)\link.exe
 
 *_ICCx86xASL_EBC_MAKE_FLAGS                 = /nologo
 *_ICCx86xASL_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
 *_ICCx86xASL_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_ICCx86xASL_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_ICCx86xASL_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_ICCx86xASL_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
 *_ICCx86xASL_EBC_DLINK_FLAGS                = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -6519,11 +6519,11 @@ NOOPT_ICCx86xASL_IPF_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /LTCG /D
 
 *_ICC11_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
 *_ICC11_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
 
 *_ICC11_*_MAKE_FLAGS                       = /nologo
-*_ICC11_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_ICC11_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_ICC11_*_APP_FLAGS                        = /nologo /E /TC
 *_ICC11_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
 
 *_ICC11_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
 
@@ -6651,11 +6651,11 @@ NOOPT_ICC11_IPF_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /LTCG /DLL /O
 *_ICC11_EBC_DLINK_PATH            = DEF(EBC_BIN)\link.exe
 
 *_ICC11_EBC_MAKE_FLAGS                 = /nologo
 *_ICC11_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
 *_ICC11_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_ICC11_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_ICC11_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_ICC11_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
 *_ICC11_EBC_DLINK_FLAGS                = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 ####################################################################################
 #
@@ -6672,11 +6672,11 @@ NOOPT_ICC11_IPF_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /LTCG /DLL /O
 
 *_ICC11xASL_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
 *_ICC11xASL_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
 
 *_ICC11xASL_*_MAKE_FLAGS                       = /nologo
-*_ICC11xASL_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_ICC11xASL_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_ICC11xASL_*_APP_FLAGS                        = /nologo /E /TC
 *_ICC11xASL_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
 
 *_ICC11xASL_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
 
@@ -6805,11 +6805,11 @@ NOOPT_ICC11xASL_IPF_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /LTCG /DL
 *_ICC11xASL_EBC_DLINK_PATH            = DEF(EBC_BIN)\link.exe
 
 *_ICC11xASL_EBC_MAKE_FLAGS                 = /nologo
 *_ICC11xASL_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
 *_ICC11xASL_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_ICC11xASL_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_ICC11xASL_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_ICC11xASL_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
 *_ICC11xASL_EBC_DLINK_FLAGS                = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -6827,11 +6827,11 @@ NOOPT_ICC11xASL_IPF_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /LTCG /DL
 
 *_ICC11x86_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
 *_ICC11x86_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
 
 *_ICC11x86_*_MAKE_FLAGS                       = /nologo
-*_ICC11x86_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_ICC11x86_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_ICC11x86_*_APP_FLAGS                        = /nologo /E /TC
 *_ICC11x86_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
 
 *_ICC11x86_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
 
@@ -6953,11 +6953,11 @@ NOOPT_ICC11x86_IPF_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /LTCG /DLL
 *_ICC11x86_EBC_DLINK_PATH            = DEF(EBC_BINx86)\link.exe
 
 *_ICC11x86_EBC_MAKE_FLAGS                 = /nologo
 *_ICC11x86_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
 *_ICC11x86_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_ICC11x86_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_ICC11x86_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_ICC11x86_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
 *_ICC11x86_EBC_DLINK_FLAGS                = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -6975,11 +6975,11 @@ NOOPT_ICC11x86_IPF_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /LTCG /DLL
 
 *_ICC11x86xASL_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
 *_ICC11x86xASL_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
 
 *_ICC11x86xASL_*_MAKE_FLAGS                       = /nologo
-*_ICC11x86xASL_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_ICC11x86xASL_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_ICC11x86xASL_*_APP_FLAGS                        = /nologo /E /TC
 *_ICC11x86xASL_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
 
 *_ICC11x86xASL_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
 
@@ -7102,11 +7102,11 @@ NOOPT_ICC11x86xASL_IPF_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /LTCG
 *_ICC11x86xASL_EBC_DLINK_PATH            = DEF(EBC_BINx86)\link.exe
 
 *_ICC11x86xASL_EBC_MAKE_FLAGS                 = /nologo
 *_ICC11x86xASL_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
 *_ICC11x86xASL_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_ICC11x86xASL_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_ICC11x86xASL_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_ICC11x86xASL_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
 *_ICC11x86xASL_EBC_DLINK_FLAGS                = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -7131,11 +7131,11 @@ NOOPT_ICC11x86xASL_IPF_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /LTCG
 *_MYTOOLS_*_ASLPP_FLAGS     = DEF(MSFT_ASLPP_FLAGS)
 *_MYTOOLS_*_ASLDLINK_FLAGS  = DEF(MSFT_ASLDLINK_FLAGS)
 
 
 *_MYTOOLS_*_MAKE_FLAGS                   = /nologo
-*_MYTOOLS_*_VFRPP_FLAGS                  = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_MYTOOLS_*_VFRPP_FLAGS                  = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_MYTOOLS_*_APP_FLAGS                    = /nologo /E /TC
 *_MYTOOLS_*_PP_FLAGS                     = /nologo /E /TC /FIAutoGen.h
 *_MYTOOLS_*_SLINK_FLAGS                  = /nologo /LTCG
 
 *_MYTOOLS_*_ASM16_PATH      = DEF(VS2008_BIN)\ml.exe
@@ -7244,11 +7244,11 @@ NOOPT_MYTOOLS_IPF_DLINK_FLAGS            = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_MYTOOLS_EBC_RC_PATH               = DEF(VS2005_BIN)\rc.exe
 
 *_MYTOOLS_EBC_MAKE_FLAGS                 = /nologo
 *_MYTOOLS_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
 *_MYTOOLS_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_MYTOOLS_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_MYTOOLS_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
 *_MYTOOLS_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
 *_MYTOOLS_EBC_DLINK_FLAGS                = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
 ####################################################################################
@@ -7293,11 +7293,11 @@ RELEASE_XCODE32_IA32_DLINK_FLAGS      = -arch i386 -u _$(IMAGE_ENTRY_POINT) -e _
 *_XCODE32_IA32_SLINK_FLAGS      = -static -o
   DEBUG_XCODE32_IA32_ASM_FLAGS  = -arch i386 -g
 RELEASE_XCODE32_IA32_ASM_FLAGS  = -arch i386
 *_XCODE32_IA32_NASM_FLAGS       = -f macho32
 *_XCODE32_IA32_PP_FLAGS         = -arch i386 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h
-*_XCODE32_IA32_VFRPP_FLAGS      = -arch i386 -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
+*_XCODE32_IA32_VFRPP_FLAGS      = -arch i386 -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h
   DEBUG_XCODE32_IA32_CC_FLAGS   = -arch i386 -save-temps -g -O0 -combine -mms-bitfields  -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces  -c -include AutoGen.h -mdynamic-no-pic -fno-stack-protector
 RELEASE_XCODE32_IA32_CC_FLAGS   = -arch i386 -Oz -combine -mms-bitfields  -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h -mdynamic-no-pic -fno-stack-protector
 
 *_XCODE32_IA32_ASLCC_FLAGS      = -arch i386 -x c -save-temps -g -O0 -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h -mdynamic-no-pic
 *_XCODE32_IA32_ASLDLINK_FLAGS   = -arch i386 -e _main -preload -segalign 0x20  -pie -seg1addr 0x220 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
@@ -7324,11 +7324,11 @@ RELEASE_XCODE32_IA32_CC_FLAGS   = -arch i386 -Oz -combine -mms-bitfields  -fshor
 
   DEBUG_XCODE32_X64_ASM_FLAGS  = -arch x86_64 -g
 RELEASE_XCODE32_X64_ASM_FLAGS  = -arch x86_64
 *_XCODE32_X64_NASM_FLAGS       = -f macho64
 *_XCODE32_X64_PP_FLAGS         = -arch x86_64 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h
-*_XCODE32_X64_VFRPP_FLAGS      = -arch x86_64 -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
+*_XCODE32_X64_VFRPP_FLAGS      = -arch x86_64 -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h
 
   DEBUG_XCODE32_X64_CC_FLAGS   = -arch x86_64 -save-temps -g -O0 -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-address  -fomit-frame-pointer -static  -c -include AutoGen.h -fno-stack-protector
 RELEASE_XCODE32_X64_CC_FLAGS   = -arch x86_64 -Oz -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-address  -fomit-frame-pointer -static  -c -include AutoGen.h -fno-stack-protector
 
 ##################
@@ -7353,11 +7353,11 @@ RELEASE_XCODE32_ARM_DLINK_FLAGS      = $(ARCHDLINK_FLAGS) -u _$(IMAGE_ENTRY_POIN
 *_XCODE32_ARM_SLINK_FLAGS      = -static -o
 
   DEBUG_XCODE32_ARM_ASM_FLAGS  = $(ARCHASM_FLAGS) -g
 RELEASE_XCODE32_ARM_ASM_FLAGS  = $(ARCHASM_FLAGS)
 *_XCODE32_ARM_PP_FLAGS         = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h
-*_XCODE32_ARM_VFRPP_FLAGS      = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
+*_XCODE32_ARM_VFRPP_FLAGS      = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h
 
   DEBUG_XCODE32_ARM_CC_FLAGS   = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-interwork -g -Oz -mabi=aapcs -mapcs -fno-short-enums  -save-temps -combine -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h
 RELEASE_XCODE32_ARM_CC_FLAGS   = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-interwork -Oz    -mabi=aapcs -mapcs -fno-short-enums  -save-temps -combine -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h
 
 
@@ -7415,11 +7415,11 @@ RELEASE_XCLANG_X64_DLINK_FLAGS      = -arch x86_64 -u _$(IMAGE_ENTRY_POINT) -e _
 *_XCLANG_X64_SLINK_FLAGS      = -static -o
   DEBUG_XCLANG_X64_ASM_FLAGS  = -arch x86_64 -g
 RELEASE_XCLANG_X64_ASM_FLAGS  = -arch x86_64 
 *_XCLANG_X64_NASM_FLAGS       = -f macho64
 *_XCLANG_*_PP_FLAGS         = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h 
-*_XCLANG_*_VFRPP_FLAGS      = -x c -E -P -DVFRCOMPILE -include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h 
+*_XCLANG_*_VFRPP_FLAGS      = -x c -E -P -DVFRCOMPILE -include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h -include $(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h
 
 
   DEBUG_XCLANG_X64_CC_FLAGS   = -ccc-host-triple x86_64-pc-win32-macho -c -g -O0  -Wall -Werror -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang
 RELEASE_XCLANG_X64_CC_FLAGS   = -ccc-host-triple x86_64-pc-win32-macho -c    -Os  -Wall -Werror -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang
 *_XCLANG_*_ASLCC_FLAGS      = -x c -save-temps -g -O0 -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h -mdynamic-no-pic
@@ -7489,11 +7489,11 @@ RELEASE_XCODE5_X64_DLINK_FLAGS      = -arch x86_64 -u _$(IMAGE_ENTRY_POINT) -e _
   DEBUG_XCODE5_X64_ASM_FLAGS  = -arch x86_64 -g
   NOOPT_XCODE5_X64_ASM_FLAGS  = -arch x86_64 -g
 RELEASE_XCODE5_X64_ASM_FLAGS  = -arch x86_64 
       *_XCODE5_X64_NASM_FLAGS = -f macho64
 *_XCODE5_*_PP_FLAGS         = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h 
-*_XCODE5_*_VFRPP_FLAGS      = -x c -E -P -DVFRCOMPILE -include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h 
+*_XCODE5_*_VFRPP_FLAGS      = -x c -E -P -DVFRCOMPILE -include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h -include $(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h
 
 
   DEBUG_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c -g -Os       -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
   NOOPT_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c -g -O0       -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
 RELEASE_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c    -Os       -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
@@ -7535,11 +7535,11 @@ DEFINE RVCT_ALL_DLINK_FLAGS = --no_scanlib --no_exceptions --datacompressor off
 RELEASE_RVCT_ARM_DLINK_FLAGS     = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map 
 
 
 *_RVCT_ARM_ASM_FLAGS       = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_ASM_FLAGS)
 *_RVCT_ARM_PP_FLAGS        = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E --preinclude AutoGen.h
-*_RVCT_ARM_VFRPP_FLAGS     = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
+*_RVCT_ARM_VFRPP_FLAGS     = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h
 *_RVCT_ARM_MAKE_PATH       = nmake /NOLOGO
 *_RVCT_ARM_SLINK_FLAGS     = --partial -o
   DEBUG_RVCT_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g
 RELEASE_RVCT_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --diag_suppress=550 DEF(RVCT_ALL_CC_FLAGS) -O2
 
@@ -7576,11 +7576,11 @@ RELEASE_RVCT_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --diag_suppress=5
 DEBUG_RVCTLINUX_ARM_DLINK_FLAGS     = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map 
 RELEASE_RVCTLINUX_ARM_DLINK_FLAGS   = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map
 
 *_RVCTLINUX_ARM_ASM_FLAGS       = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_ASM_FLAGS)
 *_RVCTLINUX_ARM_PP_FLAGS        = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E
-*_RVCTLINUX_ARM_VFRPP_FLAGS     = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
+*_RVCTLINUX_ARM_VFRPP_FLAGS     = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h
 *_RVCTLINUX_ARM_SLINK_FLAGS     = --partial -o
   DEBUG_RVCTLINUX_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g
 RELEASE_RVCTLINUX_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --diag_suppress=550 DEF(RVCT_ALL_CC_FLAGS) -O2
 
 ##################
@@ -7623,11 +7623,11 @@ RELEASE_RVCTLINUX_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --diag_suppr
   DEBUG_RVCTCYGWIN_ARM_DLINK_FLAGS     = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` 
 RELEASE_RVCTCYGWIN_ARM_DLINK_FLAGS     = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` 
  
 *_RVCTCYGWIN_ARM_ASM_FLAGS       = "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_ASM_FLAGS)
 *_RVCTCYGWIN_ARM_PP_FLAGS        = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E
-*_RVCTCYGWIN_ARM_VFRPP_FLAGS     = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude `cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h`
+*_RVCTCYGWIN_ARM_VFRPP_FLAGS     = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude `cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h` --preinclude `cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h`
 *_RVCTCYGWIN_ARM_MAKE_PATH       = make
 *_RVCTCYGWIN_ARM_SLINK_FLAGS     = "$(SLINKPATH_FLAG)" --partial -o
   DEBUG_RVCTCYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g
 RELEASE_RVCTCYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --diag_suppress=550 DEF(RVCT_ALL_CC_FLAGS) -O2
 
-- 
2.6.1.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [Patch] BaseTools: tools_def.txt to append new option in VFRPP flag

Posted by Gao, Liming 7 years, 7 months ago

Yonghong:
  Please consider the case that $(MODULE_NAME)ImgDefs.h is not generated. This patch may not work. 

Thanks
Liming
>-----Original Message-----
>From: Zhu, Yonghong
>Sent: Tuesday, March 28, 2017 5:37 PM
>To: edk2-devel@lists.01.org
>Cc: Gao, Liming <liming.gao@intel.com>
>Subject: [Patch] BaseTools: tools_def.txt to append new option in VFRPP flag
>
>tools_def.txt to append new option (/FI$(MODULE_NAME)ImgDefs.h) in
>VFRPP
>flag.
>
>Cc: Liming Gao <liming.gao@intel.com>
>Contributed-under: TianoCore Contribution Agreement 1.0
>Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
>---
> BaseTools/Conf/tools_def.template | 172 +++++++++++++++++++------------
>-------
> 1 file changed, 86 insertions(+), 86 deletions(-)
>
>diff --git a/BaseTools/Conf/tools_def.template
>b/BaseTools/Conf/tools_def.template
>index ab4f936..b537abe 100755
>--- a/BaseTools/Conf/tools_def.template
>+++ b/BaseTools/Conf/tools_def.template
>@@ -802,11 +802,11 @@ DEFINE SOURCERY_CYGWIN_TOOLS =
>/cygdrive/c/Program Files/CodeSourcery/Sourcery G
> *_VS2003_IA32_RC_PATH               = DEF(VS2003_BIN)\rc.exe
>
>       *_VS2003_IA32_MAKE_FLAGS      = /nologo
>       *_VS2003_IA32_APP_FLAGS       = /nologo /E /TC
>       *_VS2003_IA32_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
>-      *_VS2003_IA32_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+      *_VS2003_IA32_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>   DEBUG_VS2003_IA32_CC_FLAGS        = /nologo /c /WX /W4 /Gs32768 /Gy /D
>UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Zi /Gm
> RELEASE_VS2003_IA32_CC_FLAGS        = /nologo /c /WX /W4 /Gs32768 /Gy /D
>UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX-
> NOOPT_VS2003_IA32_CC_FLAGS          = /nologo /c /WX /W4 /Gs32768 /Gy /D
>UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Zi /Gm /Od
>
>   DEBUG_VS2003_IA32_ASM_FLAGS       = /nologo /c /WX /W3 /coff /Cx /Zd
>/Zi
>@@ -836,11 +836,11 @@ NOOPT_VS2003_IA32_DLINK_FLAGS       = /NOLOGO
>/NODEFAULTLIB /IGNORE:4001 /OPT:RE
> *_VS2003_EBC_RC_PATH                = DEF(VS2003_BIN)\rc.exe
>
> *_VS2003_EBC_MAKE_FLAGS             = /nologo
> *_VS2003_EBC_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h
> *_VS2003_EBC_CC_FLAGS               = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2003_EBC_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2003_EBC_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2003_EBC_SLINK_FLAGS            = /lib /NOLOGO /MACHINE:EBC
> *_VS2003_EBC_DLINK_FLAGS            = "C:\Program
>Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>###########################################################
>#########################
> #
>@@ -880,11 +880,11 @@ NOOPT_VS2003_IA32_DLINK_FLAGS       = /NOLOGO
>/NODEFAULTLIB /IGNORE:4001 /OPT:RE
>
>
>       *_VS2003xASL_IA32_MAKE_FLAGS      = /nologo
>       *_VS2003xASL_IA32_APP_FLAGS       = /nologo /E /TC
>       *_VS2003xASL_IA32_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
>-      *_VS2003xASL_IA32_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+      *_VS2003xASL_IA32_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>   DEBUG_VS2003xASL_IA32_CC_FLAGS        = /nologo /c /WX /W4 /Gs32768
>/Gy /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Zi /Gm
> RELEASE_VS2003xASL_IA32_CC_FLAGS        = /nologo /c /WX /W4 /Gs32768
>/Gy /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX-
> NOOPT_VS2003xASL_IA32_CC_FLAGS          = /nologo /c /WX /W4 /Gs32768
>/Gy /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Zi /Gm /Od
>
>   DEBUG_VS2003xASL_IA32_ASM_FLAGS       = /nologo /c /WX /W3 /coff /Cx
>/Zd /Zi
>@@ -914,11 +914,11 @@ NOOPT_VS2003xASL_IA32_DLINK_FLAGS       =
>/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OP
> *_VS2003xASL_EBC_RC_PATH                = DEF(VS2003_BIN)\rc.exe
>
> *_VS2003xASL_EBC_MAKE_FLAGS             = /nologo
> *_VS2003xASL_EBC_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h
> *_VS2003xASL_EBC_CC_FLAGS               = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2003xASL_EBC_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2003xASL_EBC_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2003xASL_EBC_SLINK_FLAGS            = /lib /NOLOGO /MACHINE:EBC
> *_VS2003xASL_EBC_DLINK_FLAGS            = "C:\Program
>Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>###########################################################
>#########################
> # Microsoft Visual Studio 2005
>@@ -934,11 +934,11 @@ NOOPT_VS2003xASL_IA32_DLINK_FLAGS       =
>/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OP
> *_VS2005_*_RC_PATH                = DEF(VS2005_BIN)\rc.exe
>
> *_VS2005_*_SLINK_FLAGS            = /NOLOGO /LTCG
> *_VS2005_*_APP_FLAGS              = /nologo /E /TC
> *_VS2005_*_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h
>-*_VS2005_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2005_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2005_*_ASM16_PATH             = DEF(VS2005_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -1057,11 +1057,11 @@ NOOPT_VS2005_IPF_DLINK_FLAGS    = /NOLOGO
>/NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF
> *_VS2005_EBC_DLINK_PATH          = DEF(EBC_BIN)\link.exe
>
> *_VS2005_EBC_MAKE_FLAGS          = /nologo
> *_VS2005_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2005_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2005_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2005_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2005_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2005_EBC_DLINK_FLAGS         = "C:\Program
>Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>###########################################################
>#########################
> #
>@@ -1078,11 +1078,11 @@ NOOPT_VS2005_IPF_DLINK_FLAGS    = /NOLOGO
>/NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF
> *_VS2005xASL_*_RC_PATH         = DEF(VS2005_BIN)\rc.exe
>
> *_VS2005xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
> *_VS2005xASL_*_APP_FLAGS       = /nologo /E /TC
> *_VS2005xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
>-*_VS2005xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2005xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2005xASL_*_ASM16_PATH      = DEF(VS2005_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -1201,11 +1201,11 @@ NOOPT_VS2005xASL_IPF_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,
> *_VS2005xASL_EBC_DLINK_PATH          = DEF(EBC_BIN)\link.exe
>
> *_VS2005xASL_EBC_MAKE_FLAGS          = /nologo
> *_VS2005xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2005xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2005xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2005xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2005xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2005xASL_EBC_DLINK_FLAGS         = "C:\Program
>Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>###########################################################
>#########################
> #
>@@ -1222,11 +1222,11 @@ NOOPT_VS2005xASL_IPF_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,
> *_VS2005x86_*_RC_PATH         = DEF(VS2005x86_BIN)\rc.exe
>
> *_VS2005x86_*_SLINK_FLAGS     = /NOLOGO /LTCG
> *_VS2005x86_*_APP_FLAGS       = /nologo /E /TC
> *_VS2005x86_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
>-*_VS2005x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2005x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2005x86_*_ASM16_PATH      = DEF(VS2005x86_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -1345,11 +1345,11 @@ NOOPT_VS2005x86_IPF_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,I
> *_VS2005x86_EBC_DLINK_PATH          = DEF(EBC_BINx86)\link.exe
>
> *_VS2005x86_EBC_MAKE_FLAGS          = /nologo
> *_VS2005x86_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2005x86_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2005x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2005x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2005x86_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2005x86_EBC_DLINK_FLAGS         = "C:\Program Files
>(x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>###########################################################
>#########################
> #
>@@ -1366,11 +1366,11 @@ NOOPT_VS2005x86_IPF_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,I
> *_VS2005x86xASL_*_RC_PATH         = DEF(VS2005x86_BIN)\rc.exe
>
> *_VS2005x86xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
> *_VS2005x86xASL_*_APP_FLAGS       = /nologo /E /TC
> *_VS2005x86xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
>-*_VS2005x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2005x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2005x86xASL_*_ASM16_PATH      = DEF(VS2005x86_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -1489,11 +1489,11 @@ NOOPT_VS2005x86xASL_IPF_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:R
> *_VS2005x86xASL_EBC_DLINK_PATH          = DEF(EBC_BINx86)\link.exe
>
> *_VS2005x86xASL_EBC_MAKE_FLAGS          = /nologo
> *_VS2005x86xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2005x86xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2005x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2005x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2005x86xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2005x86xASL_EBC_DLINK_FLAGS         = "C:\Program Files
>(x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -1511,11 +1511,11 @@ NOOPT_VS2005x86xASL_IPF_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:R
> *_VS2008_*_RC_PATH                = DEF(WINSDK_BIN)\rc.exe
>
> *_VS2008_*_SLINK_FLAGS            = /NOLOGO /LTCG
> *_VS2008_*_APP_FLAGS              = /nologo /E /TC
> *_VS2008_*_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h
>-*_VS2008_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2008_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2008_*_ASM16_PATH             = DEF(VS2008_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -1635,11 +1635,11 @@ NOOPT_VS2008_IPF_DLINK_FLAGS    = /NOLOGO
>/NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF
> *_VS2008_EBC_DLINK_PATH          = DEF(VS2008_BIN)\link.exe
>
> *_VS2008_EBC_MAKE_FLAGS          = /nologo
> *_VS2008_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2008_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2008_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2008_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2008_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2008_EBC_DLINK_FLAGS         = "C:\Program
>Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -1657,11 +1657,11 @@ NOOPT_VS2008_IPF_DLINK_FLAGS    = /NOLOGO
>/NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF
> *_VS2008xASL_*_RC_PATH         = DEF(WINSDK_BIN)\rc.exe
>
> *_VS2008xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
> *_VS2008xASL_*_APP_FLAGS       = /nologo /E /TC
> *_VS2008xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
>-*_VS2008xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2008xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2008xASL_*_ASM16_PATH      = DEF(VS2008_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -1781,11 +1781,11 @@ NOOPT_VS2008xASL_IPF_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,
> *_VS2008xASL_EBC_DLINK_PATH          = DEF(VS2008_BIN)\link.exe
>
> *_VS2008xASL_EBC_MAKE_FLAGS          = /nologo
> *_VS2008xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2008xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2008xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2008xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2008xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2008xASL_EBC_DLINK_FLAGS         = "C:\Program
>Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -1801,11 +1801,11 @@ NOOPT_VS2008xASL_IPF_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,
>
> *_VS2008x86_*_MAKE_FLAGS      = /nologo
> *_VS2008x86_*_SLINK_FLAGS     = /NOLOGO /LTCG
> *_VS2008x86_*_APP_FLAGS       = /nologo /E /TC
> *_VS2008x86_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
>-*_VS2008x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2008x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2008x86_*_ASM16_PATH      = DEF(VS2008x86_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -1925,11 +1925,11 @@ NOOPT_VS2008x86_IPF_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,I
> *_VS2008x86_EBC_DLINK_PATH          = DEF(VS2008x86_BIN)\link.exe
>
> *_VS2008x86_EBC_MAKE_FLAGS          = /nologo
> *_VS2008x86_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2008x86_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2008x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2008x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2008x86_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2008x86_EBC_DLINK_FLAGS         = "C:\Program Files
>(x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -1944,11 +1944,11 @@ NOOPT_VS2008x86_IPF_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,I
>
> *_VS2008x86xASL_*_MAKE_FLAGS      = /nologo
> *_VS2008x86xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
> *_VS2008x86xASL_*_APP_FLAGS       = /nologo /E /TC
> *_VS2008x86xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
>-*_VS2008x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2008x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2008x86xASL_*_ASM16_PATH      = DEF(VS2008x86_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -2068,11 +2068,11 @@ NOOPT_VS2008x86xASL_IPF_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:R
> *_VS2008x86xASL_EBC_DLINK_PATH          = DEF(VS2008x86_BIN)\link.exe
>
> *_VS2008x86xASL_EBC_MAKE_FLAGS          = /nologo
> *_VS2008x86xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2008x86xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2008x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2008x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2008x86xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2008x86xASL_EBC_DLINK_FLAGS         = "C:\Program Files
>(x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -2090,11 +2090,11 @@ NOOPT_VS2008x86xASL_IPF_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:R
> *_VS2010_*_RC_PATH                = DEF(WINSDK7_BIN)\rc.exe
>
> *_VS2010_*_SLINK_FLAGS            = /NOLOGO /LTCG
> *_VS2010_*_APP_FLAGS              = /nologo /E /TC
> *_VS2010_*_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h
>-*_VS2010_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2010_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2010_*_ASM16_PATH             = DEF(VS2010_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -2214,11 +2214,11 @@ NOOPT_VS2010_IPF_DLINK_FLAGS    = /NOLOGO
>/NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF
> *_VS2010_EBC_DLINK_PATH          = DEF(VS2010_BIN)\link.exe
>
> *_VS2010_EBC_MAKE_FLAGS          = /nologo
> *_VS2010_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2010_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2010_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2010_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2010_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2010_EBC_DLINK_FLAGS         = "C:\Program
>Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -2236,11 +2236,11 @@ NOOPT_VS2010_IPF_DLINK_FLAGS    = /NOLOGO
>/NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF
> *_VS2010xASL_*_RC_PATH         = DEF(WINSDK7_BIN)\rc.exe
>
> *_VS2010xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
> *_VS2010xASL_*_APP_FLAGS       = /nologo /E /TC
> *_VS2010xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
>-*_VS2010xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2010xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2010xASL_*_ASM16_PATH      = DEF(VS2010_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -2360,11 +2360,11 @@ NOOPT_VS2010xASL_IPF_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,
> *_VS2010xASL_EBC_DLINK_PATH          = DEF(VS2010_BIN)\link.exe
>
> *_VS2010xASL_EBC_MAKE_FLAGS          = /nologo
> *_VS2010xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2010xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2010xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2010xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2010xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2010xASL_EBC_DLINK_FLAGS         = "C:\Program
>Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -2380,11 +2380,11 @@ NOOPT_VS2010xASL_IPF_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,
>
> *_VS2010x86_*_MAKE_FLAGS      = /nologo
> *_VS2010x86_*_SLINK_FLAGS     = /NOLOGO /LTCG
> *_VS2010x86_*_APP_FLAGS       = /nologo /E /TC
> *_VS2010x86_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
>-*_VS2010x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2010x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2010x86_*_ASM16_PATH      = DEF(VS2010x86_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -2504,11 +2504,11 @@ NOOPT_VS2010x86_IPF_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,I
> *_VS2010x86_EBC_DLINK_PATH          = DEF(VS2010x86_BIN)\link.exe
>
> *_VS2010x86_EBC_MAKE_FLAGS          = /nologo
> *_VS2010x86_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2010x86_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2010x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2010x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2010x86_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2010x86_EBC_DLINK_FLAGS         = "C:\Program Files
>(x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -2523,11 +2523,11 @@ NOOPT_VS2010x86_IPF_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,I
>
> *_VS2010x86xASL_*_MAKE_FLAGS      = /nologo
> *_VS2010x86xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
> *_VS2010x86xASL_*_APP_FLAGS       = /nologo /E /TC
> *_VS2010x86xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
>-*_VS2010x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2010x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2010x86xASL_*_ASM16_PATH      = DEF(VS2010x86_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -2647,11 +2647,11 @@ NOOPT_VS2010x86xASL_IPF_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:R
> *_VS2010x86xASL_EBC_DLINK_PATH          = DEF(VS2010x86_BIN)\link.exe
>
> *_VS2010x86xASL_EBC_MAKE_FLAGS          = /nologo
> *_VS2010x86xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2010x86xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2010x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2010x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2010x86xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2010x86xASL_EBC_DLINK_FLAGS         = "C:\Program Files
>(x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -2669,11 +2669,11 @@ NOOPT_VS2010x86xASL_IPF_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:R
> *_VS2012_*_RC_PATH                = DEF(WINSDK71_BIN)\rc.exe
>
> *_VS2012_*_SLINK_FLAGS            = /NOLOGO /LTCG
> *_VS2012_*_APP_FLAGS              = /nologo /E /TC
> *_VS2012_*_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h
>-*_VS2012_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2012_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2012_*_ASM16_PATH             = DEF(VS2012_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -2765,11 +2765,11 @@ NOOPT_VS2012_X64_DLINK_FLAGS  = /NOLOGO
>/NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
> *_VS2012_EBC_DLINK_PATH          = DEF(VS2012_BIN)\link.exe
>
> *_VS2012_EBC_MAKE_FLAGS          = /nologo
> *_VS2012_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2012_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2012_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2012_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2012_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2012_EBC_DLINK_FLAGS         = "C:\Program
>Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -2787,11 +2787,11 @@ NOOPT_VS2012_X64_DLINK_FLAGS  = /NOLOGO
>/NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
> *_VS2012xASL_*_RC_PATH         = DEF(WINSDK71_BIN)\rc.exe
>
> *_VS2012xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
> *_VS2012xASL_*_APP_FLAGS       = /nologo /E /TC
> *_VS2012xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
>-*_VS2012xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2012xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2012xASL_*_ASM16_PATH      = DEF(VS2012_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -2883,11 +2883,11 @@ NOOPT_VS2012xASL_X64_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE
> *_VS2012xASL_EBC_DLINK_PATH          = DEF(VS2012_BIN)\link.exe
>
> *_VS2012xASL_EBC_MAKE_FLAGS          = /nologo
> *_VS2012xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2012xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2012xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2012xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2012xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2012xASL_EBC_DLINK_FLAGS         = "C:\Program
>Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -2903,11 +2903,11 @@ NOOPT_VS2012xASL_X64_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE
>
> *_VS2012x86_*_MAKE_FLAGS      = /nologo
> *_VS2012x86_*_SLINK_FLAGS     = /NOLOGO /LTCG
> *_VS2012x86_*_APP_FLAGS       = /nologo /E /TC
> *_VS2012x86_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
>-*_VS2012x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2012x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2012x86_*_ASM16_PATH      = DEF(VS2012x86_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -2999,11 +2999,11 @@ NOOPT_VS2012x86_X64_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
> *_VS2012x86_EBC_DLINK_PATH          = DEF(VS2012x86_BIN)\link.exe
>
> *_VS2012x86_EBC_MAKE_FLAGS          = /nologo
> *_VS2012x86_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2012x86_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2012x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2012x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2012x86_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2012x86_EBC_DLINK_FLAGS         = "C:\Program Files
>(x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -3018,11 +3018,11 @@ NOOPT_VS2012x86_X64_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
>
> *_VS2012x86xASL_*_MAKE_FLAGS      = /nologo
> *_VS2012x86xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
> *_VS2012x86xASL_*_APP_FLAGS       = /nologo /E /TC
> *_VS2012x86xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
>-*_VS2012x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2012x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2012x86xASL_*_ASM16_PATH      = DEF(VS2012x86_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -3114,11 +3114,11 @@ NOOPT_VS2012x86xASL_X64_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT
> *_VS2012x86xASL_EBC_DLINK_PATH          = DEF(VS2012x86_BIN)\link.exe
>
> *_VS2012x86xASL_EBC_MAKE_FLAGS          = /nologo
> *_VS2012x86xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2012x86xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2012x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2012x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2012x86xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2012x86xASL_EBC_DLINK_FLAGS         = "C:\Program Files
>(x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>###########################################################
>#########################
> #
>@@ -3135,11 +3135,11 @@ NOOPT_VS2012x86xASL_X64_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT
> *_VS2013_*_RC_PATH                = DEF(WINSDK8_BIN)\rc.exe
>
> *_VS2013_*_SLINK_FLAGS            = /NOLOGO /LTCG
> *_VS2013_*_APP_FLAGS              = /nologo /E /TC
> *_VS2013_*_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h
>-*_VS2013_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2013_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2013_*_ASM16_PATH             = DEF(VS2013_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -3231,11 +3231,11 @@ NOOPT_VS2013_X64_DLINK_FLAGS  = /NOLOGO
>/NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
> *_VS2013_EBC_DLINK_PATH          = DEF(VS2013_BIN)\link.exe
>
> *_VS2013_EBC_MAKE_FLAGS          = /nologo
> *_VS2013_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2013_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2013_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2013_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2013_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2013_EBC_DLINK_FLAGS         = "C:\Program
>Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -3253,11 +3253,11 @@ NOOPT_VS2013_X64_DLINK_FLAGS  = /NOLOGO
>/NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
> *_VS2013xASL_*_RC_PATH         = DEF(WINSDK8_BIN)\rc.exe
>
> *_VS2013xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
> *_VS2013xASL_*_APP_FLAGS       = /nologo /E /TC
> *_VS2013xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
>-*_VS2013xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2013xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2013xASL_*_ASM16_PATH      = DEF(VS2013_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -3349,11 +3349,11 @@ NOOPT_VS2013xASL_X64_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE
> *_VS2013xASL_EBC_DLINK_PATH          = DEF(VS2013_BIN)\link.exe
>
> *_VS2013xASL_EBC_MAKE_FLAGS          = /nologo
> *_VS2013xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2013xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2013xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2013xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2013xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2013xASL_EBC_DLINK_FLAGS         = "C:\Program
>Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -3369,11 +3369,11 @@ NOOPT_VS2013xASL_X64_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE
>
> *_VS2013x86_*_MAKE_FLAGS      = /nologo
> *_VS2013x86_*_SLINK_FLAGS     = /NOLOGO /LTCG
> *_VS2013x86_*_APP_FLAGS       = /nologo /E /TC
> *_VS2013x86_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
>-*_VS2013x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2013x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2013x86_*_ASM16_PATH      = DEF(VS2013x86_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -3465,11 +3465,11 @@ NOOPT_VS2013x86_X64_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
> *_VS2013x86_EBC_DLINK_PATH          = DEF(VS2013x86_BIN)\link.exe
>
> *_VS2013x86_EBC_MAKE_FLAGS          = /nologo
> *_VS2013x86_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2013x86_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2013x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2013x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2013x86_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2013x86_EBC_DLINK_FLAGS         = "C:\Program Files
>(x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -3484,11 +3484,11 @@ NOOPT_VS2013x86_X64_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
>
> *_VS2013x86xASL_*_MAKE_FLAGS      = /nologo
> *_VS2013x86xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
> *_VS2013x86xASL_*_APP_FLAGS       = /nologo /E /TC
> *_VS2013x86xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
>-*_VS2013x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2013x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2013x86xASL_*_ASM16_PATH      = DEF(VS2013x86_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -3580,11 +3580,11 @@ NOOPT_VS2013x86xASL_X64_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT
> *_VS2013x86xASL_EBC_DLINK_PATH          = DEF(VS2013x86_BIN)\link.exe
>
> *_VS2013x86xASL_EBC_MAKE_FLAGS          = /nologo
> *_VS2013x86xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2013x86xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2013x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2013x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2013x86xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2013x86xASL_EBC_DLINK_FLAGS         = "C:\Program Files
>(x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -3602,11 +3602,11 @@ NOOPT_VS2013x86xASL_X64_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT
> *_VS2015_*_RC_PATH                = DEF(WINSDK81_BIN)\rc.exe
>
> *_VS2015_*_SLINK_FLAGS            = /NOLOGO /LTCG
> *_VS2015_*_APP_FLAGS              = /nologo /E /TC
> *_VS2015_*_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h
>-*_VS2015_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2015_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2015_*_ASM16_PATH             = DEF(VS2015_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -3698,11 +3698,11 @@ NOOPT_VS2015_X64_DLINK_FLAGS  = /NOLOGO
>/NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
> *_VS2015_EBC_DLINK_PATH          = DEF(VS2015_BIN)\link.exe
>
> *_VS2015_EBC_MAKE_FLAGS          = /nologo
> *_VS2015_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2015_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2015_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2015_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2015_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2015_EBC_DLINK_FLAGS         = "C:\Program
>Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -3720,11 +3720,11 @@ NOOPT_VS2015_X64_DLINK_FLAGS  = /NOLOGO
>/NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
> *_VS2015xASL_*_RC_PATH         = DEF(WINSDK81_BIN)\rc.exe
>
> *_VS2015xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
> *_VS2015xASL_*_APP_FLAGS       = /nologo /E /TC
> *_VS2015xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
>-*_VS2015xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2015xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2015xASL_*_ASM16_PATH      = DEF(VS2015_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -3816,11 +3816,11 @@ NOOPT_VS2015xASL_X64_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE
> *_VS2015xASL_EBC_DLINK_PATH          = DEF(VS2015_BIN)\link.exe
>
> *_VS2015xASL_EBC_MAKE_FLAGS          = /nologo
> *_VS2015xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2015xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2015xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2015xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2015xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2015xASL_EBC_DLINK_FLAGS         = "C:\Program
>Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -3836,11 +3836,11 @@ NOOPT_VS2015xASL_X64_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE
>
> *_VS2015x86_*_MAKE_FLAGS      = /nologo
> *_VS2015x86_*_SLINK_FLAGS     = /NOLOGO /LTCG
> *_VS2015x86_*_APP_FLAGS       = /nologo /E /TC
> *_VS2015x86_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
>-*_VS2015x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2015x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2015x86_*_ASM16_PATH      = DEF(VS2015x86_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -3932,11 +3932,11 @@ NOOPT_VS2015x86_X64_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
> *_VS2015x86_EBC_DLINK_PATH          = DEF(VS2015x86_BIN)\link.exe
>
> *_VS2015x86_EBC_MAKE_FLAGS          = /nologo
> *_VS2015x86_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2015x86_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2015x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2015x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2015x86_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2015x86_EBC_DLINK_FLAGS         = "C:\Program Files
>(x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -3951,11 +3951,11 @@ NOOPT_VS2015x86_X64_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
>
> *_VS2015x86xASL_*_MAKE_FLAGS      = /nologo
> *_VS2015x86xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG
> *_VS2015x86xASL_*_APP_FLAGS       = /nologo /E /TC
> *_VS2015x86xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
>-*_VS2015x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2015x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_VS2015x86xASL_*_ASM16_PATH      = DEF(VS2015x86_BIN)\ml.exe
>
> ##################
> # ASL definitions
>@@ -4047,11 +4047,11 @@ NOOPT_VS2015x86xASL_X64_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT
> *_VS2015x86xASL_EBC_DLINK_PATH          = DEF(VS2015x86_BIN)\link.exe
>
> *_VS2015x86xASL_EBC_MAKE_FLAGS          = /nologo
> *_VS2015x86xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
> *_VS2015x86xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_VS2015x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_VS2015x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_VS2015x86xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
> *_VS2015x86xASL_EBC_DLINK_FLAGS         = "C:\Program Files
>(x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -4070,11 +4070,11 @@ NOOPT_VS2015x86xASL_X64_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT
> *_DDK3790_*_RC_PATH         = DEF(WINDDK_BIN32)\rc.exe
>
> *_DDK3790_*_PP_FLAGS             = /nologo /E /TC /FIAutoGen.h
> *_DDK3790_*_APP_FLAGS            = /nologo /E /TC
> *_DDK3790_*_SLINK_FLAGS          = /nologo /LTCG
>-*_DDK3790_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_DDK3790_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_DDK3790_*_ASM16_PATH      = DEF(WINDDK_BIN32)\ml.exe
>
> ##################
> # ASL definitions
>@@ -4204,11 +4204,11 @@ NOOPT_DDK3790_IPF_DLINK_FLAGS    =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF
> *_DDK3790xASL_*_RC_PATH         = DEF(WINDDK_BIN32)\rc.exe
>
> *_DDK3790xASL_*_PP_FLAGS             = /nologo /E /TC /FIAutoGen.h
> *_DDK3790xASL_*_APP_FLAGS            = /nologo /E /TC
> *_DDK3790xASL_*_SLINK_FLAGS          = /nologo /LTCG
>-*_DDK3790xASL_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_DDK3790xASL_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
>
> *_DDK3790xASL_*_ASM16_PATH      = DEF(WINDDK_BIN32)\ml.exe
>
> ##################
> # ASL definitions
>@@ -4356,11 +4356,11 @@ DEFINE GCC_IA32_X64_DLINK_FLAGS    =
>DEF(GCC_IA32_X64_DLINK_COMMON) --entry _$(I
> DEFINE GCC_IPF_DLINK_FLAGS         = -nostdlib -O2 --gc-sections --dll -static --
>entry $(IMAGE_ENTRY_POINT) --undefined $(IMAGE_ENTRY_POINT) -Map
>$(DEST_DIR_DEBUG)/$(BASE_NAME).map
> DEFINE GCC_IPF_OBJCOPY_FLAGS       = -I elf64-ia64-little -O efi-bsdrv-ia64
> DEFINE GCC_IPF_SYMRENAME_FLAGS     = --redefine-sym
>memcpy=CopyMem
> DEFINE GCC_ASM_FLAGS               = -c -x assembler -imacros
>$(DEST_DIR_DEBUG)/AutoGen.h
> DEFINE GCC_PP_FLAGS                = -E -x assembler-with-cpp -include
>$(DEST_DIR_DEBUG)/AutoGen.h
>-DEFINE GCC_VFRPP_FLAGS             = -x c -E -P -DVFRCOMPILE --include
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
>+DEFINE GCC_VFRPP_FLAGS             = -x c -E -P -DVFRCOMPILE --include
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h --include
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h
> DEFINE GCC_ASLPP_FLAGS             = -x c -E -include AutoGen.h
> DEFINE GCC_ASLCC_FLAGS             = -x c
> DEFINE GCC_WINDRES_FLAGS           = -J rc -O coff
> DEFINE GCC_IA32_RC_FLAGS           = -I binary -O elf32-i386          -B i386    --
>rename-section .data=.hii
> DEFINE GCC_X64_RC_FLAGS            = -I binary -O elf64-x86-64        -B i386    --
>rename-section .data=.hii
>@@ -5712,11 +5712,11 @@ NOOPT_CLANG38_X64_DLINK2_FLAGS     =
>DEF(GCC5_X64_DLINK2_FLAGS) -O0
> *_CYGGCCxASL_*_MAKE_FLAGS                 = /nologo
> *_CYGGCCxASL_*_PP_FLAGS                   = -E -x assembler-with-cpp -include
>AutoGen.h
> *_CYGGCCxASL_*_DLINK_FLAGS                = -nostdlib -O2 --gc-sections --dll --
>export-all-symbols --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --
>section-alignment 0x20
> *_CYGGCCxASL_*_ASM_FLAGS                  = -c -x assembler -imacros
>AutoGen.h
> *_CYGGCCxASL_*_APP_FLAGS                  = -E -x assembler
>-*_CYGGCCxASL_*_VFRPP_FLAGS                = -x c -E -P -DVFRCOMPILE --
>include $(MODULE_NAME)StrDefs.h
>+*_CYGGCCxASL_*_VFRPP_FLAGS                = -x c -E -P -DVFRCOMPILE --
>include $(MODULE_NAME)StrDefs.h --include $(MODULE_NAME)ImgDefs.h
>
> ##################
> # ASL definitions
> ##################
> *_CYGGCCxASL_*_ASL_PATH        = DEF(WIN_ASL_BIN)
>@@ -5810,11 +5810,11 @@ NOOPT_CLANG38_X64_DLINK2_FLAGS     =
>DEF(GCC5_X64_DLINK2_FLAGS) -O0
> *_ELFGCC_*_*_FAMILY                 = GCC
> *_ELFGCC_*_*_BUILDRULEFAMILY        = GCCLD
> *_ELFGCC_*_MAKE_PATH                = make
>
> *_ELFGCC_*_PP_FLAGS                     = -E -x assembler-with-cpp -include
>AutoGen.h
>-*_ELFGCC_*_VFRPP_FLAGS                  = -x c -E -P -DVFRCOMPILE --include
>$(MODULE_NAME)StrDefs.h
>+*_ELFGCC_*_VFRPP_FLAGS                  = -x c -E -P -DVFRCOMPILE --include
>$(MODULE_NAME)StrDefs.h --include $(MODULE_NAME)ImgDefs.h
>
> ##################
> # ASL definitions
> ##################
> *_ELFGCC_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)
>@@ -5843,11 +5843,11 @@ NOOPT_CLANG38_X64_DLINK2_FLAGS     =
>DEF(GCC5_X64_DLINK2_FLAGS) -O0
> *_ELFGCC_IA32_SLINK_FLAGS           =
> *_ELFGCC_IA32_DLINK_FLAGS           = -melf_i386 -nostdlib --shared --entry
>$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map
>$(DEST_DIR_DEBUG)/$(BASE_NAME).map
> #*_ELFGCC_IA32_DLINK_FLAGS          = -melf_i386 -nostdlib -n -q -Ttext 0x220
>--entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT)
> *_ELFGCC_IA32_ASM_FLAGS             = -m32 -c -x assembler -imacros
>$(DEST_DIR_DEBUG)/AutoGen.h
> *_ELFGCC_IA32_PP_FLAGS              = -m32 -E -x assembler-with-cpp -include
>$(DEST_DIR_DEBUG)/AutoGen.h
>-*_ELFGCC_IA32_VFRPP_FLAGS           = -x c -E -P -DVFRCOMPILE --include
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
>+*_ELFGCC_IA32_VFRPP_FLAGS           = -x c -E -P -DVFRCOMPILE --include
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h --include
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h
> *_ELFGCC_IA32_RC_FLAGS              = DEF(GCC_IA32_RC_FLAGS)
> *_ELFGCC_IA32_OBJCOPY_FLAGS         =
> *_ELFGCC_IA32_NASM_FLAGS            = -f elf32
>
> ##################
>@@ -5867,11 +5867,11 @@ NOOPT_CLANG38_X64_DLINK2_FLAGS     =
>DEF(GCC5_X64_DLINK2_FLAGS) -O0
> *_ELFGCC_X64_CC_FLAGS              = -Os -fshort-wchar -fno-strict-aliasing -Wall
>-Werror -Wno-address -Wno-array-bounds -include AutoGen.h -D_EFI_P64
> *_ELFGCC_X64_DLINK_FLAGS           = -nostdlib --shared --entry
>$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map
>$(DEST_DIR_DEBUG)/$(BASE_NAME).map
> *_ELFGCC_X64_SLINK_FLAGS           =
> *_ELFGCC_X64_ASM_FLAGS             = -c -x assembler -imacros
>$(DEST_DIR_DEBUG)/AutoGen.h
> *_ELFGCC_X64_PP_FLAGS              = -E -x assembler-with-cpp -include
>$(DEST_DIR_DEBUG)/AutoGen.h
>-*_ELFGCC_X64_VFRPP_FLAGS           = -x c -E -P -DVFRCOMPILE --include
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
>+*_ELFGCC_X64_VFRPP_FLAGS           = -x c -E -P -DVFRCOMPILE --include
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h --include
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h
> *_ELFGCC_X64_RC_FLAGS              = DEF(GCC_X64_RC_FLAGS)
> *_ELFGCC_X64_NASM_FLAGS            = -f elf64
>
> ##################
> # IPF definitions
>@@ -5890,11 +5890,11 @@ NOOPT_CLANG38_X64_DLINK2_FLAGS     =
>DEF(GCC5_X64_DLINK2_FLAGS) -O0
> *_ELFGCC_IPF_CC_FLAGS             = -Os -fshort-wchar -Wall -Werror -include
>AutoGen.h -D_EFI_P64
> *_ELFGCC_IPF_DLINK_FLAGS          = -nostdlib --shared --entry
>$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map
>$(DEST_DIR_DEBUG)/$(BASE_NAME).map
> *_ELFGCC_IPF_SLINK_FLAGS          =
> *_ELFGCC_IPF_ASM_FLAGS            = -c -x assembler -imacros
>$(DEST_DIR_DEBUG)/AutoGen.h
> *_ELFGCC_IPF_PP_FLAGS             = -E -x assembler-with-cpp -include
>$(DEST_DIR_DEBUG)/AutoGen.h
>-*_ELFGCC_IPF_VFRPP_FLAGS          = -x c -E -P -DVFRCOMPILE --include
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
>+*_ELFGCC_IPF_VFRPP_FLAGS          = -x c -E -P -DVFRCOMPILE --include
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h --include
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h
> *_ELFGCC_IPF_RC_FLAGS             = DEF(GCC_IPF_RC_FLAGS)
>
>
>###########################################################
>#########################
> #
> # Intel(R) C++ Compiler Version 9.1
>@@ -5908,11 +5908,11 @@ NOOPT_CLANG38_X64_DLINK2_FLAGS     =
>DEF(GCC5_X64_DLINK2_FLAGS) -O0
>
> *_ICC_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
> *_ICC_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
>
> *_ICC_*_MAKE_FLAGS                       = /nologo
>-*_ICC_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_ICC_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_ICC_*_APP_FLAGS                        = /nologo /E /TC
> *_ICC_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
>
> *_ICC_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
>
>@@ -6040,11 +6040,11 @@ NOOPT_ICC_IPF_DLINK_FLAGS                =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
> *_ICC_EBC_DLINK_PATH            = DEF(EBC_BIN)\link.exe
>
> *_ICC_EBC_MAKE_FLAGS                 = /nologo
> *_ICC_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
> *_ICC_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_ICC_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_ICC_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_ICC_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
> *_ICC_EBC_DLINK_FLAGS                = "C:\Program
>Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>###########################################################
>#########################
> #
>@@ -6059,11 +6059,11 @@ NOOPT_ICC_IPF_DLINK_FLAGS                =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
>
> *_ICCxASL_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
> *_ICCxASL_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
>
> *_ICCxASL_*_MAKE_FLAGS                       = /nologo
>-*_ICCxASL_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_ICCxASL_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_ICCxASL_*_APP_FLAGS                        = /nologo /E /TC
> *_ICCxASL_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
>
> *_ICCxASL_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
>
>@@ -6192,11 +6192,11 @@ NOOPT_ICCxASL_IPF_DLINK_FLAGS                =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL
> *_ICCxASL_EBC_DLINK_PATH            = DEF(EBC_BIN)\link.exe
>
> *_ICCxASL_EBC_MAKE_FLAGS                 = /nologo
> *_ICCxASL_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
> *_ICCxASL_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_ICCxASL_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_ICCxASL_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_ICCxASL_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
> *_ICCxASL_EBC_DLINK_FLAGS                = "C:\Program
>Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -6212,11 +6212,11 @@ NOOPT_ICCxASL_IPF_DLINK_FLAGS                =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL
>
> *_ICCx86_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
> *_ICCx86_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
>
> *_ICCx86_*_MAKE_FLAGS                       = /nologo
>-*_ICCx86_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_ICCx86_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_ICCx86_*_APP_FLAGS                        = /nologo /E /TC
> *_ICCx86_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
>
> *_ICCx86_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
>
>@@ -6345,11 +6345,11 @@ NOOPT_ICCx86_IPF_DLINK_FLAGS                =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /
> *_ICCx86_EBC_DLINK_PATH            = DEF(EBC_BINx86)\link.exe
>
> *_ICCx86_EBC_MAKE_FLAGS                 = /nologo
> *_ICCx86_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
> *_ICCx86_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_ICCx86_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_ICCx86_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_ICCx86_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
> *_ICCx86_EBC_DLINK_FLAGS                = "C:\Program Files
>(x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -6365,11 +6365,11 @@ NOOPT_ICCx86_IPF_DLINK_FLAGS                =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /
>
> *_ICCx86xASL_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
> *_ICCx86xASL_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
>
> *_ICCx86xASL_*_MAKE_FLAGS                       = /nologo
>-*_ICCx86xASL_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_ICCx86xASL_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_ICCx86xASL_*_APP_FLAGS                        = /nologo /E /TC
> *_ICCx86xASL_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
>
> *_ICCx86ASL_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
>
>@@ -6498,11 +6498,11 @@ NOOPT_ICCx86xASL_IPF_DLINK_FLAGS                =
>/NOLOGO /NODEFAULTLIB /LTCG /D
> *_ICCx86xASL_EBC_DLINK_PATH            = DEF(EBC_BINx86)\link.exe
>
> *_ICCx86xASL_EBC_MAKE_FLAGS                 = /nologo
> *_ICCx86xASL_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
> *_ICCx86xASL_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_ICCx86xASL_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_ICCx86xASL_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_ICCx86xASL_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
> *_ICCx86xASL_EBC_DLINK_FLAGS                = "C:\Program Files
>(x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -6519,11 +6519,11 @@ NOOPT_ICCx86xASL_IPF_DLINK_FLAGS                =
>/NOLOGO /NODEFAULTLIB /LTCG /D
>
> *_ICC11_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
> *_ICC11_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
>
> *_ICC11_*_MAKE_FLAGS                       = /nologo
>-*_ICC11_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_ICC11_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_ICC11_*_APP_FLAGS                        = /nologo /E /TC
> *_ICC11_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
>
> *_ICC11_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
>
>@@ -6651,11 +6651,11 @@ NOOPT_ICC11_IPF_DLINK_FLAGS                =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /O
> *_ICC11_EBC_DLINK_PATH            = DEF(EBC_BIN)\link.exe
>
> *_ICC11_EBC_MAKE_FLAGS                 = /nologo
> *_ICC11_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
> *_ICC11_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_ICC11_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_ICC11_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_ICC11_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
> *_ICC11_EBC_DLINK_FLAGS                = "C:\Program
>Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>###########################################################
>#########################
> #
>@@ -6672,11 +6672,11 @@ NOOPT_ICC11_IPF_DLINK_FLAGS                =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /O
>
> *_ICC11xASL_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
> *_ICC11xASL_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
>
> *_ICC11xASL_*_MAKE_FLAGS                       = /nologo
>-*_ICC11xASL_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_ICC11xASL_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_ICC11xASL_*_APP_FLAGS                        = /nologo /E /TC
> *_ICC11xASL_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
>
> *_ICC11xASL_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
>
>@@ -6805,11 +6805,11 @@ NOOPT_ICC11xASL_IPF_DLINK_FLAGS                =
>/NOLOGO /NODEFAULTLIB /LTCG /DL
> *_ICC11xASL_EBC_DLINK_PATH            = DEF(EBC_BIN)\link.exe
>
> *_ICC11xASL_EBC_MAKE_FLAGS                 = /nologo
> *_ICC11xASL_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
> *_ICC11xASL_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_ICC11xASL_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_ICC11xASL_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_ICC11xASL_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
> *_ICC11xASL_EBC_DLINK_FLAGS                = "C:\Program
>Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -6827,11 +6827,11 @@ NOOPT_ICC11xASL_IPF_DLINK_FLAGS                =
>/NOLOGO /NODEFAULTLIB /LTCG /DL
>
> *_ICC11x86_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
> *_ICC11x86_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
>
> *_ICC11x86_*_MAKE_FLAGS                       = /nologo
>-*_ICC11x86_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_ICC11x86_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_ICC11x86_*_APP_FLAGS                        = /nologo /E /TC
> *_ICC11x86_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
>
> *_ICC11x86_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
>
>@@ -6953,11 +6953,11 @@ NOOPT_ICC11x86_IPF_DLINK_FLAGS                =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL
> *_ICC11x86_EBC_DLINK_PATH            = DEF(EBC_BINx86)\link.exe
>
> *_ICC11x86_EBC_MAKE_FLAGS                 = /nologo
> *_ICC11x86_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
> *_ICC11x86_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_ICC11x86_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_ICC11x86_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_ICC11x86_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
> *_ICC11x86_EBC_DLINK_FLAGS                = "C:\Program Files
>(x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -6975,11 +6975,11 @@ NOOPT_ICC11x86_IPF_DLINK_FLAGS                =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL
>
> *_ICC11x86xASL_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
> *_ICC11x86xASL_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
>
> *_ICC11x86xASL_*_MAKE_FLAGS                       = /nologo
>-*_ICC11x86xASL_*_VFRPP_FLAGS                      = /nologo /E /TC
>/DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
>+*_ICC11x86xASL_*_VFRPP_FLAGS                      = /nologo /E /TC
>/DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
>/FI$(MODULE_NAME)ImgDefs.h
> *_ICC11x86xASL_*_APP_FLAGS                        = /nologo /E /TC
> *_ICC11x86xASL_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
>
> *_ICC11x86xASL_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
>
>@@ -7102,11 +7102,11 @@ NOOPT_ICC11x86xASL_IPF_DLINK_FLAGS
>= /NOLOGO /NODEFAULTLIB /LTCG
> *_ICC11x86xASL_EBC_DLINK_PATH            = DEF(EBC_BINx86)\link.exe
>
> *_ICC11x86xASL_EBC_MAKE_FLAGS                 = /nologo
> *_ICC11x86xASL_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
> *_ICC11x86xASL_EBC_CC_FLAGS                   = /nologo /c /WX /W3
>/FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_ICC11x86xASL_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_ICC11x86xASL_EBC_VFRPP_FLAGS                = /nologo /E /TC
>/DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
>/FI$(MODULE_NAME)ImgDefs.h
> *_ICC11x86xASL_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
> *_ICC11x86xASL_EBC_DLINK_FLAGS                = "C:\Program Files
>(x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -7131,11 +7131,11 @@ NOOPT_ICC11x86xASL_IPF_DLINK_FLAGS
>= /NOLOGO /NODEFAULTLIB /LTCG
> *_MYTOOLS_*_ASLPP_FLAGS     = DEF(MSFT_ASLPP_FLAGS)
> *_MYTOOLS_*_ASLDLINK_FLAGS  = DEF(MSFT_ASLDLINK_FLAGS)
>
>
> *_MYTOOLS_*_MAKE_FLAGS                   = /nologo
>-*_MYTOOLS_*_VFRPP_FLAGS                  = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_MYTOOLS_*_VFRPP_FLAGS                  = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_MYTOOLS_*_APP_FLAGS                    = /nologo /E /TC
> *_MYTOOLS_*_PP_FLAGS                     = /nologo /E /TC /FIAutoGen.h
> *_MYTOOLS_*_SLINK_FLAGS                  = /nologo /LTCG
>
> *_MYTOOLS_*_ASM16_PATH      = DEF(VS2008_BIN)\ml.exe
>@@ -7244,11 +7244,11 @@ NOOPT_MYTOOLS_IPF_DLINK_FLAGS            =
>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
> *_MYTOOLS_EBC_RC_PATH               = DEF(VS2005_BIN)\rc.exe
>
> *_MYTOOLS_EBC_MAKE_FLAGS                 = /nologo
> *_MYTOOLS_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
> *_MYTOOLS_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h
>/D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
>-*_MYTOOLS_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h
>+*_MYTOOLS_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE
>/FI$(MODULE_NAME)StrDefs.h /FI$(MODULE_NAME)ImgDefs.h
> *_MYTOOLS_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
> *_MYTOOLS_EBC_DLINK_FLAGS                = "C:\Program
>Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC
>/OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT)
>/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
>
>
>
>###########################################################
>#########################
>@@ -7293,11 +7293,11 @@ RELEASE_XCODE32_IA32_DLINK_FLAGS      = -arch
>i386 -u _$(IMAGE_ENTRY_POINT) -e _
> *_XCODE32_IA32_SLINK_FLAGS      = -static -o
>   DEBUG_XCODE32_IA32_ASM_FLAGS  = -arch i386 -g
> RELEASE_XCODE32_IA32_ASM_FLAGS  = -arch i386
> *_XCODE32_IA32_NASM_FLAGS       = -f macho32
> *_XCODE32_IA32_PP_FLAGS         = -arch i386 -E -x assembler-with-cpp -
>include $(DEST_DIR_DEBUG)/AutoGen.h
>-*_XCODE32_IA32_VFRPP_FLAGS      = -arch i386 -x c -E -P -DVFRCOMPILE --
>include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
>+*_XCODE32_IA32_VFRPP_FLAGS      = -arch i386 -x c -E -P -DVFRCOMPILE --
>include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h --include
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h
>   DEBUG_XCODE32_IA32_CC_FLAGS   = -arch i386 -save-temps -g -O0 -
>combine -mms-bitfields  -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-
>missing-braces  -c -include AutoGen.h -mdynamic-no-pic -fno-stack-protector
> RELEASE_XCODE32_IA32_CC_FLAGS   = -arch i386 -Oz -combine -mms-
>bitfields  -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces
>-fomit-frame-pointer -c -include AutoGen.h -mdynamic-no-pic -fno-stack-
>protector
>
> *_XCODE32_IA32_ASLCC_FLAGS      = -arch i386 -x c -save-temps -g -O0 -
>mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-
>braces -c -include AutoGen.h -mdynamic-no-pic
> *_XCODE32_IA32_ASLDLINK_FLAGS   = -arch i386 -e _main -preload -segalign
>0x20  -pie -seg1addr 0x220 -read_only_relocs suppress -map
>$(DEST_DIR_DEBUG)/$(BASE_NAME).map
>@@ -7324,11 +7324,11 @@ RELEASE_XCODE32_IA32_CC_FLAGS   = -arch i386 -
>Oz -combine -mms-bitfields  -fshor
>
>   DEBUG_XCODE32_X64_ASM_FLAGS  = -arch x86_64 -g
> RELEASE_XCODE32_X64_ASM_FLAGS  = -arch x86_64
> *_XCODE32_X64_NASM_FLAGS       = -f macho64
> *_XCODE32_X64_PP_FLAGS         = -arch x86_64 -E -x assembler-with-cpp -
>include $(DEST_DIR_DEBUG)/AutoGen.h
>-*_XCODE32_X64_VFRPP_FLAGS      = -arch x86_64 -x c -E -P -DVFRCOMPILE --
>include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
>+*_XCODE32_X64_VFRPP_FLAGS      = -arch x86_64 -x c -E -P -DVFRCOMPILE --
>include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h --include
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h
>
>   DEBUG_XCODE32_X64_CC_FLAGS   = -arch x86_64 -save-temps -g -O0 -
>mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-
>braces -Wno-address  -fomit-frame-pointer -static  -c -include AutoGen.h -
>fno-stack-protector
> RELEASE_XCODE32_X64_CC_FLAGS   = -arch x86_64 -Oz -mms-bitfields -
>fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-
>address  -fomit-frame-pointer -static  -c -include AutoGen.h -fno-stack-
>protector
>
> ##################
>@@ -7353,11 +7353,11 @@ RELEASE_XCODE32_ARM_DLINK_FLAGS      =
>$(ARCHDLINK_FLAGS) -u _$(IMAGE_ENTRY_POIN
> *_XCODE32_ARM_SLINK_FLAGS      = -static -o
>
>   DEBUG_XCODE32_ARM_ASM_FLAGS  = $(ARCHASM_FLAGS) -g
> RELEASE_XCODE32_ARM_ASM_FLAGS  = $(ARCHASM_FLAGS)
> *_XCODE32_ARM_PP_FLAGS         = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS)
>-E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h
>-*_XCODE32_ARM_VFRPP_FLAGS      = $(ARCHCC_FLAGS)
>$(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
>+*_XCODE32_ARM_VFRPP_FLAGS      = $(ARCHCC_FLAGS)
>$(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h --include
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h
>
>   DEBUG_XCODE32_ARM_CC_FLAGS   = $(ARCHCC_FLAGS)
>$(PLATFORM_FLAGS) -mthumb-interwork -g -Oz -mabi=aapcs -mapcs -fno-
>short-enums  -save-temps -combine -fshort-wchar -fno-strict-aliasing -Wall -
>Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h
> RELEASE_XCODE32_ARM_CC_FLAGS   = $(ARCHCC_FLAGS)
>$(PLATFORM_FLAGS) -mthumb-interwork -Oz    -mabi=aapcs -mapcs -fno-
>short-enums  -save-temps -combine -fshort-wchar -fno-strict-aliasing -Wall -
>Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h
>
>
>@@ -7415,11 +7415,11 @@ RELEASE_XCLANG_X64_DLINK_FLAGS      = -arch
>x86_64 -u _$(IMAGE_ENTRY_POINT) -e _
> *_XCLANG_X64_SLINK_FLAGS      = -static -o
>   DEBUG_XCLANG_X64_ASM_FLAGS  = -arch x86_64 -g
> RELEASE_XCLANG_X64_ASM_FLAGS  = -arch x86_64
> *_XCLANG_X64_NASM_FLAGS       = -f macho64
> *_XCLANG_*_PP_FLAGS         = -E -x assembler-with-cpp -include
>$(DEST_DIR_DEBUG)/AutoGen.h
>-*_XCLANG_*_VFRPP_FLAGS      = -x c -E -P -DVFRCOMPILE -include
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
>+*_XCLANG_*_VFRPP_FLAGS      = -x c -E -P -DVFRCOMPILE -include
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h -include
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h
>
>
>   DEBUG_XCLANG_X64_CC_FLAGS   = -ccc-host-triple x86_64-pc-win32-
>macho -c -g -O0  -Wall -Werror -include AutoGen.h -fno-stack-protector -fno-
>builtin -fshort-wchar -mdynamic-no-pic -Wno-empty-body -Wno-pointer-sign
>-Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-
>tautological-compare -Wreturn-type -Wno-unused-variable -ftrap-
>function=undefined_behavior_has_been_optimized_away_by_clang
> RELEASE_XCLANG_X64_CC_FLAGS   = -ccc-host-triple x86_64-pc-win32-
>macho -c    -Os  -Wall -Werror -include AutoGen.h -fno-stack-protector -fno-
>builtin -fshort-wchar -mdynamic-no-pic -Wno-empty-body -Wno-pointer-sign
>-Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-
>tautological-compare -Wreturn-type -Wno-unused-variable -ftrap-
>function=undefined_behavior_has_been_optimized_away_by_clang
> *_XCLANG_*_ASLCC_FLAGS      = -x c -save-temps -g -O0 -fshort-wchar -fno-
>strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h -
>mdynamic-no-pic
>@@ -7489,11 +7489,11 @@ RELEASE_XCODE5_X64_DLINK_FLAGS      = -arch
>x86_64 -u _$(IMAGE_ENTRY_POINT) -e _
>   DEBUG_XCODE5_X64_ASM_FLAGS  = -arch x86_64 -g
>   NOOPT_XCODE5_X64_ASM_FLAGS  = -arch x86_64 -g
> RELEASE_XCODE5_X64_ASM_FLAGS  = -arch x86_64
>       *_XCODE5_X64_NASM_FLAGS = -f macho64
> *_XCODE5_*_PP_FLAGS         = -E -x assembler-with-cpp -include
>$(DEST_DIR_DEBUG)/AutoGen.h
>-*_XCODE5_*_VFRPP_FLAGS      = -x c -E -P -DVFRCOMPILE -include
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
>+*_XCODE5_*_VFRPP_FLAGS      = -x c -E -P -DVFRCOMPILE -include
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h -include
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h
>
>
>   DEBUG_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c -g -
>Os       -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-
>extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float
>-mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-
>field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-
>function=undefined_behavior_has_been_optimized_away_by_clang
>$(PLATFORM_FLAGS)
>   NOOPT_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c -g -
>O0       -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-
>extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float
>-mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-
>field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-
>function=undefined_behavior_has_been_optimized_away_by_clang
>$(PLATFORM_FLAGS)
> RELEASE_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c    -Os
>-Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-
>extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float
>-mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-
>field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-
>function=undefined_behavior_has_been_optimized_away_by_clang
>$(PLATFORM_FLAGS)
>@@ -7535,11 +7535,11 @@ DEFINE RVCT_ALL_DLINK_FLAGS = --no_scanlib --
>no_exceptions --datacompressor off
> RELEASE_RVCT_ARM_DLINK_FLAGS     = $(ARCHDLINK_FLAGS)
>DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list
>$(DEST_DIR_DEBUG)/$(BASE_NAME).map
>
>
> *_RVCT_ARM_ASM_FLAGS       = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS)
>DEF(RVCT_ALL_ASM_FLAGS)
> *_RVCT_ARM_PP_FLAGS        = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E --
>preinclude AutoGen.h
>-*_RVCT_ARM_VFRPP_FLAGS     = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E
>-DVFRCOMPILE --preinclude
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
>+*_RVCT_ARM_VFRPP_FLAGS     = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -
>E  -DVFRCOMPILE --preinclude
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h --preinclude
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h
> *_RVCT_ARM_MAKE_PATH       = nmake /NOLOGO
> *_RVCT_ARM_SLINK_FLAGS     = --partial -o
>   DEBUG_RVCT_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS)
>DEF(RVCT_ALL_CC_FLAGS) -O1 -g
> RELEASE_RVCT_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS)
>--diag_suppress=550 DEF(RVCT_ALL_CC_FLAGS) -O2
>
>@@ -7576,11 +7576,11 @@ RELEASE_RVCT_ARM_CC_FLAGS  =
>$(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --diag_suppress=5
> DEBUG_RVCTLINUX_ARM_DLINK_FLAGS     = $(ARCHDLINK_FLAGS)
>DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list
>$(DEST_DIR_DEBUG)/$(BASE_NAME).map
> RELEASE_RVCTLINUX_ARM_DLINK_FLAGS   = $(ARCHDLINK_FLAGS)
>DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list
>$(DEST_DIR_DEBUG)/$(BASE_NAME).map
>
> *_RVCTLINUX_ARM_ASM_FLAGS       = $(ARCHASM_FLAGS)
>$(PLATFORM_FLAGS) DEF(RVCT_ALL_ASM_FLAGS)
> *_RVCTLINUX_ARM_PP_FLAGS        = $(ARCHCC_FLAGS)
>$(PLATFORM_FLAGS) -E
>-*_RVCTLINUX_ARM_VFRPP_FLAGS     = $(ARCHCC_FLAGS)
>$(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
>+*_RVCTLINUX_ARM_VFRPP_FLAGS     = $(ARCHCC_FLAGS)
>$(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h --preinclude
>$(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h
> *_RVCTLINUX_ARM_SLINK_FLAGS     = --partial -o
>   DEBUG_RVCTLINUX_ARM_CC_FLAGS  = $(ARCHCC_FLAGS)
>$(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g
> RELEASE_RVCTLINUX_ARM_CC_FLAGS  = $(ARCHCC_FLAGS)
>$(PLATFORM_FLAGS) --diag_suppress=550 DEF(RVCT_ALL_CC_FLAGS) -O2
>
> ##################
>@@ -7623,11 +7623,11 @@ RELEASE_RVCTLINUX_ARM_CC_FLAGS  =
>$(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --diag_suppr
>   DEBUG_RVCTCYGWIN_ARM_DLINK_FLAGS     = "$(DLINKPATH_FLAG)"
>$(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry
>$(IMAGE_ENTRY_POINT) --map --list `cygpath -m
>$(DEST_DIR_DEBUG)/$(BASE_NAME).map`
> RELEASE_RVCTCYGWIN_ARM_DLINK_FLAGS     = "$(DLINKPATH_FLAG)"
>$(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry
>$(IMAGE_ENTRY_POINT) --map --list `cygpath -m
>$(DEST_DIR_DEBUG)/$(BASE_NAME).map`
>
> *_RVCTCYGWIN_ARM_ASM_FLAGS       = "$(ASMPATH_FLAG)"
>$(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_ASM_FLAGS)
> *_RVCTCYGWIN_ARM_PP_FLAGS        = "$(CCPATH_FLAG)"
>$(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E
>-*_RVCTCYGWIN_ARM_VFRPP_FLAGS     = "$(CCPATH_FLAG)"
>$(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude
>`cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h`
>+*_RVCTCYGWIN_ARM_VFRPP_FLAGS     = "$(CCPATH_FLAG)"
>$(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude
>`cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h` --preinclude
>`cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)ImgDefs.h`
> *_RVCTCYGWIN_ARM_MAKE_PATH       = make
> *_RVCTCYGWIN_ARM_SLINK_FLAGS     = "$(SLINKPATH_FLAG)" --partial -o
>   DEBUG_RVCTCYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)"
>$(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g
> RELEASE_RVCTCYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)"
>$(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --diag_suppress=550
>DEF(RVCT_ALL_CC_FLAGS) -O2
>
>--
>2.6.1.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel