Changed deprecated DPATH to DLL for CYGWINGCC tool chain.

[mirror_edk2.git] / BaseTools / Conf / tools_def.template

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 9ceb21edd4b26368369266027050b4f223c25a93..e25b3e7e9f7d06c698c0813432c102d4f980269f 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -144,7 +144,6 @@ DEFINE ASL_BIN = C:\ASL
 *_VS2003_IA32_APP_PATH              = DEF(VSNET2003_BIN)\cl.exe\r
 *_VS2003_IA32_PP_PATH               = DEF(VSNET2003_BIN)\cl.exe\r
 *_VS2003_IA32_ASM_PATH              = DEF(VSNET2003_BIN)\ml.exe\r
-*_VS2003_IA32_PCH_PATH              = DEF(VSNET2003_BIN)\cl.exe\r
 *_VS2003_IA32_ASLCC_PATH            = DEF(VSNET2003_BIN)\cl.exe\r
 *_VS2003_IA32_ASLPP_PATH            = DEF(VSNET2003_BIN)\cl.exe\r
 *_VS2003_IA32_ASLDLINK_PATH         = DEF(VSNET2003_BIN)\link.exe\r
@@ -153,11 +152,9 @@ DEFINE ASL_BIN = C:\ASL
       *_VS2003_IA32_MAKE_FLAGS           = /nologo\r
       *_VS2003_IA32_APP_FLAGS            = /nologo /E /TC\r
       *_VS2003_IA32_PP_FLAGS             = /nologo /E /TC /FIAutoGen.h\r
-      *_VS2003_IA32_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+      *_VS2003_IA32_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
   DEBUG_VS2003_IA32_CC_FLAGS             = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Zi /Gm\r
 RELEASE_VS2003_IA32_CC_FLAGS             = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX-\r
-  DEBUG_VS2003_IA32_PCH_FLAGS            = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-RELEASE_VS2003_IA32_PCH_FLAGS            = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
   DEBUG_VS2003_IA32_ASM_FLAGS            = /nologo /c /WX /W3 /coff /Cx /Zd /Zi\r
 RELEASE_VS2003_IA32_ASM_FLAGS            = /nologo /c /WX /W3 /coff /Cx /Zd\r
       *_VS2003_IA32_SLINK_FLAGS          = /nologo /LTCG\r
@@ -173,9 +170,6 @@ RELEASE_VS2003_IA32_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 #   VS2005PRO           - Microsoft Visual Studio 2005 Professional Edition\r
 *_VS2005PRO_*_*_FAMILY              = MSFT\r
 \r
-*_VS2005PRO_*_TIANO_PATH            = TianoCompress.exe\r
-*_VS2005PRO_*_TIANO_GUID                 = A31280AD-481E-41B6-95E8-127F4C984779\r
-\r
 *_VS2005PRO_*_ASL_PATH              = DEF(ASL_BIN)\iasl.exe\r
 *_VS2005PRO_*_MAKE_PATH             = DEF(VS2005PRO_BIN)\nmake.exe\r
 \r
@@ -183,7 +177,7 @@ RELEASE_VS2003_IA32_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_VS2005PRO_*_SLINK_FLAGS                = /NOLOGO /LTCG\r
 *_VS2005PRO_*_APP_FLAGS                  = /nologo /E /TC\r
 *_VS2005PRO_*_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h\r
-*_VS2005PRO_*_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+*_VS2005PRO_*_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
 ##################\r
 # IA32 definitions\r
 ##################\r
@@ -237,9 +231,6 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 #   VS2005TEAMSUITE           - Microsoft Visual Studio 2005 Team Suite Edition\r
 *_VS2005TEAMSUITE_*_*_FAMILY        = MSFT\r
 \r
-*_VS2005TEAMSUITE_*_TIANO_PATH      = TianoCompress.exe\r
-*_VS2005TEAMSUITE_*_TIANO_GUID           = A31280AD-481E-41B6-95E8-127F4C984779\r
-\r
 *_VS2005TEAMSUITE_*_ASL_PATH        = DEF(ASL_BIN)\iasl.exe\r
 *_VS2005TEAMSUITE_*_MAKE_PATH       = DEF(VS2005TEAMSUITE_BIN)\nmake.exe\r
 \r
@@ -248,7 +239,7 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_VS2005TEAMSUITE_*_SLINK_FLAGS          = /NOLOGO /LTCG\r
 *_VS2005TEAMSUITE_*_APP_FLAGS            = /nologo /E /TC\r
 *_VS2005TEAMSUITE_*_PP_FLAGS             = /nologo /E /TC /FIAutoGen.h\r
-*_VS2005TEAMSUITE_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+*_VS2005TEAMSUITE_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
 ##################\r
 # IA32 definitions\r
 ##################\r
@@ -337,7 +328,7 @@ RELEASE_VS2005TEAMSUITE_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_WINDDK3790x1830_*_PP_FLAGS             = /nologo /E /TC /FIAutoGen.h\r
 *_WINDDK3790x1830_*_APP_FLAGS            = /nologo /E /TC\r
 *_WINDDK3790x1830_*_SLINK_FLAGS          = /nologo /LTCG\r
-*_WINDDK3790x1830_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+*_WINDDK3790x1830_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
 \r
 ##################\r
 # ASL definitions\r
@@ -354,7 +345,6 @@ RELEASE_VS2005TEAMSUITE_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_WINDDK3790x1830_IA32_PP_PATH      = DEF(WINDDK_BIN32)\cl.exe\r
 *_WINDDK3790x1830_IA32_VFRPP_PATH   = DEF(WINDDK_BIN32)\cl.exe\r
 *_WINDDK3790x1830_IA32_APP_PATH     = DEF(WINDDK_BIN32)\cl.exe\r
-*_WINDDK3790x1830_IA32_PCH_PATH     = DEF(WINDDK_BIN32)\cl.exe\r
 *_WINDDK3790x1830_IA32_ASM_PATH     = DEF(WINDDK_BIN32)\ml.exe\r
 *_WINDDK3790x1830_IA32_ASLCC_PATH     = DEF(WINDDK_BIN32)\cl.exe\r
 *_WINDDK3790x1830_IA32_ASLPP_PATH     = DEF(WINDDK_BIN32)\cl.exe\r
@@ -362,8 +352,6 @@ RELEASE_VS2005TEAMSUITE_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 \r
   DEBUG_WINDDK3790x1830_IA32_CC_FLAGS    = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
 RELEASE_WINDDK3790x1830_IA32_CC_FLAGS    = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
-  DEBUG_WINDDK3790x1830_IA32_PCH_FLAGS   = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-RELEASE_WINDDK3790x1830_IA32_PCH_FLAGS   = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
   DEBUG_WINDDK3790x1830_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /coff /Cx /Zd /Zi\r
 RELEASE_WINDDK3790x1830_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /coff /Cx /Zd\r
   DEBUG_WINDDK3790x1830_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
@@ -379,7 +367,6 @@ RELEASE_WINDDK3790x1830_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_WINDDK3790x1830_X64_PP_PATH      = DEF(WINDDK_BINX64)\cl.exe\r
 *_WINDDK3790x1830_X64_VFRPP_PATH   = DEF(WINDDK_BINX64)\cl.exe\r
 *_WINDDK3790x1830_X64_APP_PATH     = DEF(WINDDK_BINX64)\cl.exe\r
-*_WINDDK3790x1830_X64_PCH_PATH     = DEF(WINDDK_BINX64)\cl.exe\r
 *_WINDDK3790x1830_X64_ASM_PATH     = DEF(WINDDK_BINX64)\ml64.exe\r
 *_WINDDK3790x1830_X64_ASLCC_PATH     = DEF(WINDDK_BINX64)\cl.exe\r
 *_WINDDK3790x1830_X64_ASLPP_PATH     = DEF(WINDDK_BINX64)\cl.exe\r
@@ -387,8 +374,6 @@ RELEASE_WINDDK3790x1830_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 \r
   DEBUG_WINDDK3790x1830_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
 RELEASE_WINDDK3790x1830_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF\r
-  DEBUG_WINDDK3790x1830_X64_PCH_FLAGS    = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-RELEASE_WINDDK3790x1830_X64_PCH_FLAGS    = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
   DEBUG_WINDDK3790x1830_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
 RELEASE_WINDDK3790x1830_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
   DEBUG_WINDDK3790x1830_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
@@ -403,7 +388,6 @@ RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_WINDDK3790x1830_IPF_PP_PATH      = DEF(WINDDK_BIN64)\cl.exe\r
 *_WINDDK3790x1830_IPF_VFRPP_PATH   = DEF(WINDDK_BIN64)\cl.exe\r
 *_WINDDK3790x1830_IPF_APP_PATH     = DEF(WINDDK_BIN64)\cl.exe\r
-*_WINDDK3790x1830_IPF_PCH_PATH     = DEF(WINDDK_BIN64)\cl.exe\r
 *_WINDDK3790x1830_IPF_ASM_PATH     = DEF(WINDDK_BIN64)\ias.exe\r
 *_WINDDK3790x1830_IPF_ASLCC_PATH     = DEF(WINDDK_BIN64)\cl.exe\r
 *_WINDDK3790x1830_IPF_ASLPP_PATH     = DEF(WINDDK_BIN64)\cl.exe\r
@@ -412,8 +396,6 @@ RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 \r
   DEBUG_WINDDK3790x1830_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32 /Zi\r
 RELEASE_WINDDK3790x1830_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32\r
-  DEBUG_WINDDK3790x1830_IPF_PCH_FLAGS    = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi\r
-RELEASE_WINDDK3790x1830_IPF_PCH_FLAGS    = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
   DEBUG_WINDDK3790x1830_IPF_ASM_FLAGS    = -N us -X explicit -M ilp64 -N so -W4 -d debug\r
 RELEASE_WINDDK3790x1830_IPF_ASM_FLAGS    = -N us -X explicit -M ilp64 -N so -W4\r
   DEBUG_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb /DEBUG\r
@@ -430,7 +412,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_WINDDK3790x1830_EBC_SLINK_PATH    = DEF(EBC_BIN)\link.exe\r
 *_WINDDK3790x1830_EBC_VFRPP_PATH    = DEF(EBC_BIN)\iec.exe\r
 \r
-*_WINDDK3790x1830_EBC_CC_FLAGS           = /nologo /c /WX /W3 /FIAutoGen.h\r
+*_WINDDK3790x1830_EBC_CC_FLAGS           = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
 *_WINDDK3790x1830_EBC_SLINK_FLAGS        = /lib /NOLOGO /MACHINE:EBC\r
 *_WINDDK3790x1830_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\r
 \r
@@ -445,7 +427,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_UNIXGCC_*_DLINK_FLAGS                  = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20 -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
 *_UNIXGCC_*_ASM_FLAGS                    = -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h\r
 *_UNIXGCC_*_PP_FLAGS                     = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
-*_UNIXGCC_*_VFRPP_FLAGS                  = -x c -E -P -DVFRCOMPILE --include AutoGen.h\r
+*_UNIXGCC_*_VFRPP_FLAGS                  = -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
 *_UNIXGCC_*_MAKE_PATH                    = make\r
 \r
 ##################\r
@@ -480,7 +462,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 #   CYGWINGCC        - CygWin GCC\r
 *_CYGWINGCC_*_*_FAMILY              = GCC\r
 \r
-*_CYGWINGCC_*_*_DPATH               = DEF(CYGWIN_BIN)\r
+*_CYGWINGCC_*_*_DLL                 = DEF(CYGWIN_BIN)\r
 *_CYGWINGCC_*_ASL_PATH              = DEF(ASL_BIN)/iasl.exe\r
 *_CYGWINGCC_*_MAKE_PATH             = DEF(VSNET2003_BIN)\nmake.exe\r
 \r
@@ -489,7 +471,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_CYGWINGCC_*_ASM_FLAGS                  = -c -x assembler -imacros AutoGen.h\r
 *_CYGWINGCC_*_PP_FLAGS                   = -E -x assembler-with-cpp -include AutoGen.h\r
 *_CYGWINGCC_*_APP_FLAGS                  = -E -x assembler\r
-*_CYGWINGCC_*_VFRPP_FLAGS                = -x c -E -P -DVFRCOMPILE --include AutoGen.h\r
+*_CYGWINGCC_*_VFRPP_FLAGS                = -x c -E -P -DVFRCOMPILE --include $(MODULE_NAME)StrDefs.h\r
 \r
 ##################\r
 # IA32 definitions\r
@@ -540,7 +522,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 #*_ELFGCC_*_DLINK_FLAGS                   = -melf_i386 -nostdlib -n -q -Ttext 0x220 --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT)\r
 *_ELFGCC_*_ASM_FLAGS                     = -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h\r
 *_ELFGCC_*_PP_FLAGS                      = -m32 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
-*_ELFGCC_*_VFRPP_FLAGS                   = -x c -E -P -DVFRCOMPILE --include AutoGen.h\r
+*_ELFGCC_*_VFRPP_FLAGS                   = -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
 \r
 \r
 ####################################################################################\r
@@ -594,7 +576,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_ICC_*_MAKE_PATH                   = DEF(VS2005TEAMSUITE_BIN)\nmake.exe\r
 \r
 *_ICC_*_MAKE_FLAGS                       = /nologo\r
-*_ICC_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+*_ICC_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
 *_ICC_*_APP_FLAGS                        = /nologo /E /TC\r
 *_ICC_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h\r
 \r
@@ -605,7 +587,6 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_ICC_IA32_PCH_PATH                 = DEF(ICC_BIN32)\icl.exe\r
 *_ICC_IA32_CC_PATH                  = DEF(ICC_BIN32)\icl.exe\r
 *_ICC_IA32_SLINK_PATH               = DEF(ICC_BIN32)\xilib.exe\r
 # xilib.exe needs lib.exe from Visual Studio\r
@@ -623,8 +604,6 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 \r
   DEBUG_ICC_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Zi /Gm\r
 RELEASE_ICC_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF\r
-  DEBUG_ICC_IA32_PCH_FLAGS               = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Yc /TC /Zi /Gm\r
-RELEASE_ICC_IA32_PCH_FLAGS               = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Yc /TC\r
   DEBUG_ICC_IA32_ASM_FLAGS               = /nologo /c /WX /W3 /Zd /Zi\r
 RELEASE_ICC_IA32_ASM_FLAGS               = /nologo /c /WX /W3 /Zd\r
       *_ICC_IA32_SLINK_FLAGS             = /nologo\r
@@ -635,7 +614,6 @@ RELEASE_ICC_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ##################\r
 # X64 definitions\r
 ##################\r
-*_ICC_X64_PCH_PATH                  = DEF(ICC_BINX64)\icl.exe\r
 *_ICC_X64_CC_PATH                   = DEF(ICC_BINX64)\icl.exe\r
 *_ICC_X64_SLINK_PATH                = DEF(ICC_BINX64)\xilib.exe\r
 # xilib.exe needs lib.exe from Visual Studio\r
@@ -652,8 +630,6 @@ RELEASE_ICC_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 \r
   DEBUG_ICC_X64_CC_FLAGS                 = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF\r
 RELEASE_ICC_X64_CC_FLAGS                 = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF\r
-  DEBUG_ICC_X64_PCH_FLAGS                = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /Zi /Gm /EHs-c- /GF\r
-RELEASE_ICC_X64_PCH_FLAGS                = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /EHs-c- /GF\r
   DEBUG_ICC_X64_ASM_FLAGS                = /nologo /c /WX /W3 /Cx /Zd /Zi\r
 RELEASE_ICC_X64_ASM_FLAGS                = /nologo /c /WX /W3 /Cx /Zd\r
   DEBUG_ICC_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
@@ -673,7 +649,6 @@ RELEASE_ICC_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_ICC_IPF_DLINK_PATH                = DEF(ICC_BIN64)\xilink.exe\r
 *_ICC_IPF_PP_PATH                   = DEF(ICC_BIN64)\icl.exe\r
 *_ICC_IPF_VFRPP_PATH                = DEF(ICC_BIN64)\icl.exe\r
-*_ICC_IPF_PCH_PATH                  = DEF(ICC_BIN64)\icl.exe\r
 *_ICC_IPF_APP_PATH                  = DEF(ICC_BIN64)\icl.exe\r
 *_ICC_IPF_ASM_PATH                  = DEF(ICC_BIN64)\ias.exe\r
 *_ICC_IPF_ASLCC_PATH                = DEF(ICC_BIN64)\icl.exe\r
@@ -682,8 +657,6 @@ RELEASE_ICC_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 \r
   DEBUG_ICC_IPF_CC_FLAGS                 = /nologo /c /WX /W4 /GX /Gy /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 /Zi\r
 RELEASE_ICC_IPF_CC_FLAGS                 = /nologo /c /WX /W4 /GX /Gy /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32\r
-  DEBUG_ICC_IPF_PCH_FLAGS                = /nologo /c /WX /W4 /GX /Gy /Os /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC /Zi\r
-RELEASE_ICC_IPF_PCH_FLAGS                = /nologo /c /WX /W4 /GX /Gy /Os /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC\r
   DEBUG_ICC_IPF_ASM_FLAGS                = -N us -X explicit -M ilp64 -N so -W3 -d debug -F COFF32\r
 RELEASE_ICC_IPF_ASM_FLAGS                = -N us -X explicit -M ilp64 -N so -W3 -F COFF32\r
   DEBUG_ICC_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:64 /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb /DEBUG\r
@@ -702,21 +675,14 @@ RELEASE_ICC_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 #   MYTOOLS          - Settings compatible with previous versions of tools_def.template\r
 *_MYTOOLS_*_*_FAMILY                = MSFT\r
 \r
-*_MYTOOLS_*_TIANO_PATH              = TianoCompress.exe\r
-*_MYTOOLS_*_TIANO_GUID                   = A31280AD-481E-41B6-95E8-127F4C984779\r
-\r
 *_MYTOOLS_*_ASL_PATH                = DEF(ASL_BIN)\iasl.exe\r
 \r
 *_MYTOOLS_*_MAKE_FLAGS                   = /nologo\r
-*_MYTOOLS_*_VFRPP_FLAGS                  = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+*_MYTOOLS_*_VFRPP_FLAGS                  = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
 *_MYTOOLS_*_APP_FLAGS                    = /nologo /E /TC\r
 *_MYTOOLS_*_PP_FLAGS                     = /nologo /E /TC /FIAutoGen.h\r
 *_MYTOOLS_*_SLINK_FLAGS                  = /nologo /LTCG\r
 \r
-*_MYTOOLS_*_ASM16_PATH            = DEF(VS2005TEAMSUITE_BIN)\ml.exe\r
-  DEBUG_MYTOOLS_*_ASM16_FLAGS     = /nologo /c /WX /W3 /coff /Cx /Zd /Zi\r
-RELEASE_MYTOOLS_*_ASM16_FLAGS     = /nologo /c /WX /W3 /coff /Cx /Zd\r
-\r
 ##################\r
 # IA32 definitions\r
 ##################\r
@@ -805,10 +771,10 @@ RELEASE_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 \r
 *_MYTOOLS_EBC_MAKE_FLAGS                 = /nologo\r
 *_MYTOOLS_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h\r
-*_MYTOOLS_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h\r
-*_MYTOOLS_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+*_MYTOOLS_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
+*_MYTOOLS_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
 *_MYTOOLS_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC\r
-*_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\r
+*_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\r
 \r
 ##################\r
 # VfrCompiler definitions\r
@@ -823,3 +789,9 @@ RELEASE_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_*_*_ASLDLINK_FLAGS               = /NODEFAULTLIB /ENTRY:main\r
 *_*_*_ASLPP_FLAGS                  = /nologo /EP /C\r
 *_*_*_ASL_FLAGS                    =\r
+\r
+##################\r
+# Tiano Compress tool definitions\r
+##################\r
+*_*_*_TIANO_PATH              = TianoCompress.exe\r
+*_*_*_TIANO_GUID                   = A31280AD-481E-41B6-95E8-127F4C984779\r