Cleaned up the tools_def.template file
authorlhauch <lhauch@de2fecce-e211-0410-80a6-f3fac2684e05>
Wed, 29 Aug 2007 22:48:17 +0000 (22:48 +0000)
committerlhauch <lhauch@de2fecce-e211-0410-80a6-f3fac2684e05>
Wed, 29 Aug 2007 22:48:17 +0000 (22:48 +0000)
git-svn-id: https://edk2.tianocore.org/svn/edk2/trunk@3734 de2fecce-e211-0410-80a6-f3fac2684e05

edk2/BaseTools/Conf/tools_def.template

index 9f821f6..87e5c72 100644 (file)
@@ -67,36 +67,37 @@ IDENTIFIER = Default TOOL_CHAIN_CONF
 #\r
 ####################################################################################\r
 #   VS2003           - Microsoft Visual Studio .NET 2003\r
-*_VS2003_IA32_*_FAMILY          = MSFT\r
+*_VS2003_IA32_*_FAMILY              = MSFT\r
 \r
-*_VS2003_IA32_CC_NAME           = cl.exe\r
-*_VS2003_IA32_VFRPP_NAME        = cl.exe\r
-*_VS2003_IA32_SLINK_NAME        = lib.exe\r
-*_VS2003_IA32_DLINK_NAME        = link.exe\r
-*_VS2003_IA32_ASMLINK_NAME      = link.exe\r
-*_VS2003_IA32_APP_NAME          = cl.exe\r
-*_VS2003_IA32_PP_NAME           = cl.exe\r
-*_VS2003_IA32_ASM_NAME          = ml.exe\r
-*_VS2003_IA32_PCH_NAME          = cl.exe\r
+*_VS2003_IA32_*_PATH                = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
+*_VS2003_IA32_*_DPATH               = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r
+\r
+*_VS2003_IA32_CC_NAME               = cl.exe\r
+*_VS2003_IA32_VFRPP_NAME            = cl.exe\r
+*_VS2003_IA32_SLINK_NAME            = lib.exe\r
+*_VS2003_IA32_DLINK_NAME            = link.exe\r
+*_VS2003_IA32_ASMLINK_NAME          = link.exe\r
+*_VS2003_IA32_APP_NAME              = cl.exe\r
+*_VS2003_IA32_PP_NAME               = cl.exe\r
+*_VS2003_IA32_ASM_NAME              = ml.exe\r
+*_VS2003_IA32_PCH_NAME              = cl.exe\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_VS2003_IA32_*_PATH            = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
-*_VS2003_IA32_*_DPATH           = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r
 \r
-*_VS2003_IA32_APP_FLAGS         = /nologo /E /TC\r
-*_VS2003_IA32_PP_FLAGS          = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-*_VS2003_IA32_VFRPP_FLAGS       = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
-DEBUG_VS2003_IA32_CC_FLAGS      = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
-RELEASE_VS2003_IA32_CC_FLAGS    = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
-DEBUG_VS2003_IA32_PCH_FLAGS     = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-RELEASE_VS2003_IA32_PCH_FLAGS   = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
-DEBUG_VS2003_IA32_ASM_FLAGS     = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
-RELEASE_VS2003_IA32_ASM_FLAGS   = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
-*_VS2003_IA32_SLINK_FLAGS       = /nologo /LTCG\r
-DEBUG_VS2003_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_VS2003_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+*_VS2003_IA32_APP_FLAGS                  = /nologo /E /TC\r
+*_VS2003_IA32_PP_FLAGS                   = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_VS2003_IA32_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+DEBUG_VS2003_IA32_CC_FLAGS               = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
+RELEASE_VS2003_IA32_CC_FLAGS             = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
+DEBUG_VS2003_IA32_PCH_FLAGS              = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
+RELEASE_VS2003_IA32_PCH_FLAGS            = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+DEBUG_VS2003_IA32_ASM_FLAGS              = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
+RELEASE_VS2003_IA32_ASM_FLAGS            = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
+*_VS2003_IA32_SLINK_FLAGS                = /nologo /LTCG\r
+DEBUG_VS2003_IA32_DLINK_FLAGS            = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+RELEASE_VS2003_IA32_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
 \r
 \r
 ####################################################################################\r
@@ -107,6 +108,15 @@ RELEASE_VS2003_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /O
 #   WINDDK3790x1830  - Microsoft Windows DDK 3790.1830\r
 *_WINDDK3790x1830_*_*_FAMILY        = MSFT\r
 \r
+*_WINDDK3790x1830_IA32_*_PATH       = C:\WINDDK\3790.1830\bin\x86\r
+*_WINDDK3790x1830_IA32_*_DPATH      = C:\WINDDK\3790.1830\bin\x86\r
+*_WINDDK3790x1830_IA32_ASMLINK_PATH = C:\WINDDK\3790.1830\bin\bin16\r
+*_WINDDK3790x1830_X64_*_PATH        = C:\WINDDK\3790.1830\bin\win64\x86\amd64\r
+*_WINDDK3790x1830_X64_ASMLINK_PATH  = C:\WINDDK\3790.1830\bin\bin16\r
+*_WINDDK3790x1830_IPF_*_PATH        = C:\WINDDK\3790.1830\bin\win64\x86\r
+*_WINDDK3790x1830_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin\r
+*_WINDDK3790x1830_*_ASL_PATH        = C:\ASL\r
+\r
 *_WINDDK3790x1830_*_CC_NAME         = cl.exe\r
 *_WINDDK3790x1830_*_VFRPP_NAME      = cl.exe\r
 *_WINDDK3790x1830_*_SLINK_NAME      = lib.exe\r
@@ -116,17 +126,14 @@ RELEASE_VS2003_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /O
 *_WINDDK3790x1830_*_APP_NAME        = cl.exe\r
 *_WINDDK3790x1830_*_PCH_NAME        = cl.exe\r
 \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_*_APP_FLAGS            = /nologo /E /TC\r
+*_WINDDK3790x1830_*_SLINK_FLAGS          = /nologo /LTCG\r
+*_WINDDK3790x1830_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_WINDDK3790x1830_IA32_ASM_NAME          = ml.exe\r
-*_WINDDK3790x1830_IA32_*_PATH            = C:\WINDDK\3790.1830\bin\x86\r
-*_WINDDK3790x1830_IA32_*_DPATH           = C:\WINDDK\3790.1830\bin\x86\r
-*_WINDDK3790x1830_IA32_ASMLINK_PATH      = C:\WINDDK\3790.1830\bin\bin16\\r
+*_WINDDK3790x1830_IA32_ASM_NAME     = ml.exe\r
 \r
 *_WINDDK3790x1830_IA32_PP_FLAGS          = /nologo /E /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
 DEBUG_WINDDK3790x1830_IA32_CC_FLAGS      = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
@@ -142,58 +149,54 @@ RELEASE_WINDDK3790x1830_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ##################\r
 # x64 definitions\r
 ##################\r
-*_WINDDK3790x1830_X64_ASM_NAME          = ml64.exe\r
-*_WINDDK3790x1830_X64_*_PATH            = C:\WINDDK\3790.1830\bin\win64\x86\amd64\r
-*_WINDDK3790x1830_X64_ASMLINK_PATH      = C:\WINDDK\3790.1830\bin\bin16\\r
+*_WINDDK3790x1830_X64_ASM_NAME      = ml64.exe\r
 \r
-*_WINDDK3790x1830_X64_PP_FLAGS          = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-DEBUG_WINDDK3790x1830_X64_CC_FLAGS      = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF\r
-RELEASE_WINDDK3790x1830_X64_CC_FLAGS    = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF\r
-DEBUG_WINDDK3790x1830_X64_PCH_FLAGS     = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm /EHs-c- /GF\r
-RELEASE_WINDDK3790x1830_X64_PCH_FLAGS   = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /EHs-c- /GF\r
-DEBUG_WINDDK3790x1830_X64_ASM_FLAGS     = /nologo /W3 /WX /c /Cx /Zd /Zi\r
-RELEASE_WINDDK3790x1830_X64_ASM_FLAGS   = /nologo /W3 /WX /c /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:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+*_WINDDK3790x1830_X64_PP_FLAGS           = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+DEBUG_WINDDK3790x1830_X64_CC_FLAGS       = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF\r
+RELEASE_WINDDK3790x1830_X64_CC_FLAGS     = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF\r
+DEBUG_WINDDK3790x1830_X64_PCH_FLAGS      = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm /EHs-c- /GF\r
+RELEASE_WINDDK3790x1830_X64_PCH_FLAGS    = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /EHs-c- /GF\r
+DEBUG_WINDDK3790x1830_X64_ASM_FLAGS      = /nologo /W3 /WX /c /Cx /Zd /Zi\r
+RELEASE_WINDDK3790x1830_X64_ASM_FLAGS    = /nologo /W3 /WX /c /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:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
 \r
 ##################\r
 # IPF definitions\r
 ##################\r
-*_WINDDK3790x1830_IPF_ASM_NAME          = ias.exe\r
-*_WINDDK3790x1830_IPF_*_PATH            = C:\WINDDK\3790.1830\bin\win64\x86\r
+*_WINDDK3790x1830_IPF_ASM_NAME      = ias.exe\r
 \r
-*_WINDDK3790x1830_IPF_PP_FLAGS          = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-DEBUG_WINDDK3790x1830_IPF_CC_FLAGS      = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi\r
-RELEASE_WINDDK3790x1830_IPF_CC_FLAGS    = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-DEBUG_WINDDK3790x1830_IPF_PCH_FLAGS     = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi\r
-RELEASE_WINDDK3790x1830_IPF_PCH_FLAGS   = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.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:$(ENTRYPOINT) /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
-RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
+*_WINDDK3790x1830_IPF_PP_FLAGS           = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+DEBUG_WINDDK3790x1830_IPF_CC_FLAGS       = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi\r
+RELEASE_WINDDK3790x1830_IPF_CC_FLAGS     = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+DEBUG_WINDDK3790x1830_IPF_PCH_FLAGS      = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi\r
+RELEASE_WINDDK3790x1830_IPF_PCH_FLAGS    = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.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:$(ENTRYPOINT) /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
+RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
 \r
 ##################\r
 # EBC definitions\r
 ##################\r
 *_WINDDK3790x1830_EBC_*_FAMILY      = INTEL\r
+\r
 *_WINDDK3790x1830_EBC_PP_NAME       = iec.exe\r
 *_WINDDK3790x1830_EBC_CC_NAME       = iec.exe\r
 *_WINDDK3790x1830_EBC_DLINK_NAME    = link.exe\r
 *_WINDDK3790x1830_EBC_SLINK_NAME    = link.exe\r
-*_WINDDK3790x1830_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin\r
-*_WINDDK3790x1830_EBC_*_SPATH       = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"\r
 \r
-*_WINDDK3790x1830_EBC_PP_FLAGS      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-*_WINDDK3790x1830_EBC_CC_FLAGS      = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-*_WINDDK3790x1830_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC\r
-*_WINDDK3790x1830_EBC_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
+*_WINDDK3790x1830_EBC_PP_FLAGS           = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_WINDDK3790x1830_EBC_CC_FLAGS           = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\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:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
 \r
 ##################\r
 # ASL definitions\r
 ##################\r
-*_WINDDK3790x1830_*_ASL_FAMILY  = INTEL\r
-*_WINDDK3790x1830_*_ASL_NAME    = iasl.exe\r
-*_WINDDK3790x1830_*_ASL_PATH    = C:\ASL\r
+*_WINDDK3790x1830_*_ASL_FAMILY      = INTEL\r
+\r
+*_WINDDK3790x1830_*_ASL_NAME        = iasl.exe\r
 \r
 \r
 ####################################################################################\r
@@ -205,63 +208,65 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:
 #\r
 ####################################################################################\r
 #   VS2005EXP        - Microsoft Visual Studio 2005 Express Edition\r
-#*_VS2005EXP_IA32_*_FAMILY       = MSFT\r
-\r
-#*_VS2005EXP_IA32_CC_NAME        = cl.exe\r
-#*_VS2005EXP_IA32_SLINK_NAME     = lib.exe\r
-#*_VS2005EXP_IA32_DLINK_NAME     = link.exe\r
-#*_VS2005EXP_IA32_ASMLINK_NAME   = link.exe\r
-#*_VS2005EXP_IA32_PP_NAME        = cl.exe\r
-#*_VS2005EXP_IA32_APP_NAME       = cl.exe\r
-#*_VS2005EXP_IA32_VFRPP_NAME     = cl.exe\r
-#*_VS2005EXP_IA32_PCH_NAME       = cl.exe\r
-\r
-#*_VS2005EXP_IA32_SLINK_FLAGS       = /NOLOGO /LTCG\r
-#*_VS2005EXP_IA32_APP_FLAGS         = /nologo /E /TC\r
-#*_VS2005EXP_IA32_PP_FLAGS          = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-#*_VS2005EXP_IA32_VFRPP_FLAGS       = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+#*_VS2005EXP_IA32_*_FAMILY           = MSFT\r
+#\r
+#*_VS2005EXP_IA32_*_PATH             = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
+#*_VS2005EXP_IA32_*_DPATH            = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
+#*_VS2005EXP_IA32_ASM_PATH           = C:\WINDDK\3790.1830\bin\x86\r
+#*_VS2005EXP_IA32_ASMLINK_PATH       = C:\WINDDK\3790.1830\bin\bin16\r
+*_VS2005EXP_EBC_*_PATH              = C:\Program Files\Intel\EBC\Bin\r
+*_VS2005EXP_IA32_ASL_PATH           = C:\ASL\r
+\r
+#*_VS2005EXP_IA32_CC_NAME            = cl.exe\r
+#*_VS2005EXP_IA32_SLINK_NAME         = lib.exe\r
+#*_VS2005EXP_IA32_DLINK_NAME         = link.exe\r
+#*_VS2005EXP_IA32_ASMLINK_NAME       = link.exe\r
+#*_VS2005EXP_IA32_PP_NAME            = cl.exe\r
+#*_VS2005EXP_IA32_APP_NAME           = cl.exe\r
+#*_VS2005EXP_IA32_VFRPP_NAME         = cl.exe\r
+#*_VS2005EXP_IA32_PCH_NAME           = cl.exe\r
+\r
+#*_VS2005EXP_IA32_SLINK_FLAGS             = /NOLOGO /LTCG\r
+#*_VS2005EXP_IA32_APP_FLAGS               = /nologo /E /TC\r
+#*_VS2005EXP_IA32_PP_FLAGS                = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+#*_VS2005EXP_IA32_VFRPP_FLAGS             = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-#*_VS2005EXP_IA32_ASM_NAME     = ml.exe\r
-#*_VS2005EXP_IA32_*_PATH       = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
-#*_VS2005EXP_IA32_*_DPATH      = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
-#*_VS2005EXP_IA32_ASM_PATH     = C:\WINDDK\3790.1830\bin\x86\r
-#*_VS2005EXP_IA32_ASMLINK_PATH = C:\WINDDK\3790.1830\bin\bin16\\r
+#*_VS2005EXP_IA32_ASM_NAME           = ml.exe\r
 \r
-#DEBUG_VS2005EXP_IA32_CC_FLAGS      = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
-#RELEASE_VS2005EXP_IA32_CC_FLAGS    = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
-#DEBUG_VS2005EXP_IA32_PCH_FLAGS     = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-#RELEASE_VS2005EXP_IA32_PCH_FLAGS   = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
-#DEBUG_VS2005EXP_IA32_ASM_FLAGS     = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
-#RELEASE_VS2005EXP_IA32_ASM_FLAGS   = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
-#DEBUG_VS2005EXP_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-#RELEASE_VS2005EXP_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
-#*_VS2005EXP_IA32_ASMLINK_FLAGS     = /link /nologo /tiny\r
+#DEBUG_VS2005EXP_IA32_CC_FLAGS            = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
+#RELEASE_VS2005EXP_IA32_CC_FLAGS          = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
+#DEBUG_VS2005EXP_IA32_PCH_FLAGS           = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
+#RELEASE_VS2005EXP_IA32_PCH_FLAGS         = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+#DEBUG_VS2005EXP_IA32_ASM_FLAGS           = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
+#RELEASE_VS2005EXP_IA32_ASM_FLAGS         = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
+#DEBUG_VS2005EXP_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+#RELEASE_VS2005EXP_IA32_DLINK_FLAGS       = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+#*_VS2005EXP_IA32_ASMLINK_FLAGS           = /link /nologo /tiny\r
 \r
 ##################\r
 # EBC definitions\r
 ##################\r
-*_VS2005EXP_EBC_*_FAMILY      = INTEL\r
-*_VS2005EXP_EBC_PP_NAME       = iec.exe\r
-*_VS2005EXP_EBC_CC_NAME       = iec.exe\r
-*_VS2005EXP_EBC_DLINK_NAME    = link.exe\r
-*_VS2005EXP_EBC_SLINK_NAME    = link.exe\r
-*_VS2005EXP_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin\r
-*_VS2005EXP_EBC_*_SPATH       = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"\r
+*_VS2005EXP_EBC_*_FAMILY            = INTEL\r
+\r
+*_VS2005EXP_EBC_PP_NAME             = iec.exe\r
+*_VS2005EXP_EBC_CC_NAME             = iec.exe\r
+*_VS2005EXP_EBC_DLINK_NAME          = link.exe\r
+*_VS2005EXP_EBC_SLINK_NAME          = link.exe\r
 \r
-*_VS2005EXP_EBC_PP_FLAGS      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-*_VS2005EXP_EBC_CC_FLAGS      = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-*_VS2005EXP_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC\r
-*_VS2005EXP_EBC_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
+*_VS2005EXP_EBC_PP_FLAGS                 = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_VS2005EXP_EBC_CC_FLAGS                 = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_VS2005EXP_EBC_SLINK_FLAGS              = /lib /NOLOGO /MACHINE:EBC\r
+*_VS2005EXP_EBC_DLINK_FLAGS              = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
 \r
 ##################\r
 # ASL definitions\r
 ##################\r
-*_VS2005EXP_IA32_ASL_FAMILY  = INTEL\r
-*_VS2005EXP_IA32_ASL_NAME    = iasl.exe\r
-*_VS2005EXP_IA32_ASL_PATH    = C:\ASL\r
+*_VS2005EXP_IA32_ASL_FAMILY         = INTEL\r
+\r
+*_VS2005EXP_IA32_ASL_NAME           = iasl.exe\r
 \r
 \r
 ####################################################################################\r
@@ -273,63 +278,64 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:
 #\r
 ####################################################################################\r
 #   VS2005STD        - Microsoft Visual Studio 2005 Standard Edition\r
-#*_VS2005STD_*_*_FAMILY       = MSFT\r
-\r
-#*_VS2005STD_*_CC_NAME        = cl.exe\r
-#*_VS2005STD_*_SLINK_NAME     = lib.exe\r
-#*_VS2005STD_*_DLINK_NAME     = link.exe\r
-#*_VS2005STD_*_ASMLINK_NAME   = link.exe\r
-#*_VS2005STD_*_PP_NAME        = cl.exe\r
-#*_VS2005STD_*_APP_NAME       = cl.exe\r
-#*_VS2005STD_*_VFRPP_NAME     = cl.exe\r
-#*_VS2005STD_*_PCH_NAME       = cl.exe\r
-\r
-#*_VS2005STD_*_SLINK_FLAGS       = /NOLOGO /LTCG\r
-#*_VS2005STD_*_APP_FLAGS         = /nologo /E /TC\r
-#*_VS2005STD_*_PP_FLAGS          = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-#*_VS2005STD_*_VFRPP_FLAGS       = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+#*_VS2005STD_*_*_FAMILY              = MSFT\r
+#*_VS2005STD_IA32_*_PATH             = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
+#*_VS2005STD_IA32_*_DPATH            = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
+#*_VS2005STD_IA32_ASM_PATH           = C:\WINDDK\3790.1830\bin\x86\r
+#*_VS2005STD_IA32_ASMLINK_PATH       = C:\WINDDK\3790.1830\bin\bin16\r
+*_VS2005STD_EBC_*_PATH              = C:\Program Files\Intel\EBC\Bin\r
+*_VS2005STD_*_ASL_PATH              = C:\ASL\r
+\r
+#*_VS2005STD_*_CC_NAME               = cl.exe\r
+#*_VS2005STD_*_SLINK_NAME            = lib.exe\r
+#*_VS2005STD_*_DLINK_NAME            = link.exe\r
+#*_VS2005STD_*_ASMLINK_NAME          = link.exe\r
+#*_VS2005STD_*_PP_NAME               = cl.exe\r
+#*_VS2005STD_*_APP_NAME              = cl.exe\r
+#*_VS2005STD_*_VFRPP_NAME            = cl.exe\r
+#*_VS2005STD_*_PCH_NAME              = cl.exe\r
+\r
+#*_VS2005STD_*_SLINK_FLAGS                = /NOLOGO /LTCG\r
+#*_VS2005STD_*_APP_FLAGS                  = /nologo /E /TC\r
+#*_VS2005STD_*_PP_FLAGS                   = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+#*_VS2005STD_*_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-#*_VS2005STD_IA32_ASM_NAME     = ml.exe\r
-#*_VS2005STD_IA32_*_PATH       = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
-#*_VS2005STD_IA32_*_DPATH      = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
-#*_VS2005STD_IA32_ASM_PATH     = C:\WINDDK\3790.1830\bin\x86\r
-#*_VS2005STD_IA32_ASMLINK_PATH = C:\WINDDK\3790.1830\bin\bin16\\r
+#*_VS2005STD_IA32_ASM_NAME           = ml.exe\r
 \r
-#DEBUG_VS2005STD_IA32_CC_FLAGS      = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
-#RELEASE_VS2005STD_IA32_CC_FLAGS    = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
-#DEBUG_VS2005STD_IA32_PCH_FLAGS     = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-#RELEASE_VS2005STD_IA32_PCH_FLAGS   = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
-#DEBUG_VS2005STD_IA32_ASM_FLAGS     = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
-#RELEASE_VS2005STD_IA32_ASM_FLAGS   = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
-#DEBUG_VS2005STD_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-#RELEASE_VS2005STD_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
-#*_VS2005STD_IA32_ASMLINK_FLAGS     = /link /nologo /tiny\r
+#DEBUG_VS2005STD_IA32_CC_FLAGS            = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
+#RELEASE_VS2005STD_IA32_CC_FLAGS          = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
+#DEBUG_VS2005STD_IA32_PCH_FLAGS           = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
+#RELEASE_VS2005STD_IA32_PCH_FLAGS         = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+#DEBUG_VS2005STD_IA32_ASM_FLAGS           = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
+#RELEASE_VS2005STD_IA32_ASM_FLAGS         = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
+#DEBUG_VS2005STD_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+#RELEASE_VS2005STD_IA32_DLINK_FLAGS       = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+#*_VS2005STD_IA32_ASMLINK_FLAGS           = /link /nologo /tiny\r
 \r
 ##################\r
 # EBC definitions\r
 ##################\r
-*_VS2005STD_EBC_*_FAMILY      = INTEL\r
-*_VS2005STD_EBC_PP_NAME       = iec.exe\r
-*_VS2005STD_EBC_CC_NAME       = iec.exe\r
-*_VS2005STD_EBC_DLINK_NAME    = link.exe\r
-*_VS2005STD_EBC_SLINK_NAME    = link.exe\r
-*_VS2005STD_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin\r
-*_VS2005STD_EBC_*_SPATH       = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"\r
+*_VS2005STD_EBC_*_FAMILY            = INTEL\r
 \r
-*_VS2005STD_EBC_PP_FLAGS      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-*_VS2005STD_EBC_CC_FLAGS      = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-*_VS2005STD_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC\r
-*_VS2005STD_EBC_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
+*_VS2005STD_EBC_PP_NAME             = iec.exe\r
+*_VS2005STD_EBC_CC_NAME             = iec.exe\r
+*_VS2005STD_EBC_DLINK_NAME          = link.exe\r
+*_VS2005STD_EBC_SLINK_NAME          = link.exe\r
+\r
+*_VS2005STD_EBC_PP_FLAGS                 = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_VS2005STD_EBC_CC_FLAGS                 = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_VS2005STD_EBC_SLINK_FLAGS              = /lib /NOLOGO /MACHINE:EBC\r
+*_VS2005STD_EBC_DLINK_FLAGS              = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
 \r
 ##################\r
 # ASL definitions\r
 ##################\r
-*_VS2005STD_*_ASL_FAMILY  = INTEL\r
-*_VS2005STD_*_ASL_NAME    = iasl.exe\r
-*_VS2005STD_*_ASL_PATH    = C:\ASL\r
+*_VS2005STD_*_ASL_FAMILY            = INTEL\r
+\r
+*_VS2005STD_*_ASL_NAME              = iasl.exe\r
 \r
 \r
 ####################################################################################\r
@@ -338,80 +344,82 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:
 #\r
 ####################################################################################\r
 #   VS2005PRO        - Microsoft Visual Studio 2005 Professional Edition\r
-*_VS2005PRO_*_*_FAMILY       = MSFT\r
-\r
-*_VS2005PRO_*_CC_NAME        = cl.exe\r
-*_VS2005PRO_*_SLINK_NAME     = lib.exe\r
-*_VS2005PRO_*_DLINK_NAME     = link.exe\r
-*_VS2005PRO_*_ASMLINK_NAME   = link.exe\r
-*_VS2005PRO_*_PP_NAME        = cl.exe\r
-*_VS2005PRO_*_APP_NAME       = cl.exe\r
-*_VS2005PRO_*_VFRPP_NAME     = cl.exe\r
-*_VS2005PRO_*_PCH_NAME       = cl.exe\r
-\r
-*_VS2005PRO_*_SLINK_FLAGS       = /NOLOGO /LTCG\r
-*_VS2005PRO_*_APP_FLAGS         = /nologo /E /TC\r
-*_VS2005PRO_*_PP_FLAGS          = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-*_VS2005PRO_*_VFRPP_FLAGS       = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+*_VS2005PRO_*_*_FAMILY              = MSFT\r
+\r
+*_VS2005PRO_IA32_*_PATH             = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
+*_VS2005PRO_IA32_*_DPATH            = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
+*_VS2005PRO_IA32_ASM_PATH           = C:\WINDDK\3790.1830\bin\x86\r
+*_VS2005PRO_IA32_ASMLINK_PATH       = C:\WINDDK\3790.1830\bin\bin16\r
+*_VS2005PRO_X64_*_PATH              = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_amd64\r
+*_VS2005PRO_X64_*_DPATH             = C:\Program Files\Microsoft Visual Studio 8\VC\bin\x86_amd64;C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
+*_VS2005PRO_X64_ASMLINK_PATH        = C:\WINDDK\3790.1830\bin\bin16\r
+*_VS2005PRO_EBC_*_PATH              = C:\Program Files\Intel\EBC\Bin\r
+*_VS2005PRO_*_ASL_PATH              = C:\ASL\r
+\r
+*_VS2005PRO_*_CC_NAME               = cl.exe\r
+*_VS2005PRO_*_SLINK_NAME            = lib.exe\r
+*_VS2005PRO_*_DLINK_NAME            = link.exe\r
+*_VS2005PRO_*_ASMLINK_NAME          = link.exe\r
+*_VS2005PRO_*_PP_NAME               = cl.exe\r
+*_VS2005PRO_*_APP_NAME              = cl.exe\r
+*_VS2005PRO_*_VFRPP_NAME            = cl.exe\r
+*_VS2005PRO_*_PCH_NAME              = cl.exe\r
+\r
+*_VS2005PRO_*_SLINK_FLAGS                = /NOLOGO /LTCG\r
+*_VS2005PRO_*_APP_FLAGS                  = /nologo /E /TC\r
+*_VS2005PRO_*_PP_FLAGS                   = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_VS2005PRO_*_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_VS2005PRO_IA32_ASM_NAME     = ml.exe\r
-*_VS2005PRO_IA32_*_PATH       = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
-*_VS2005PRO_IA32_*_DPATH      = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
-*_VS2005PRO_IA32_ASM_PATH     = C:\WINDDK\3790.1830\bin\x86\r
-*_VS2005PRO_IA32_ASMLINK_PATH = C:\WINDDK\3790.1830\bin\bin16\\r
+*_VS2005PRO_IA32_ASM_NAME           = ml.exe\r
 \r
-DEBUG_VS2005PRO_IA32_CC_FLAGS      = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
-RELEASE_VS2005PRO_IA32_CC_FLAGS    = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
-DEBUG_VS2005PRO_IA32_PCH_FLAGS     = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-RELEASE_VS2005PRO_IA32_PCH_FLAGS   = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
-DEBUG_VS2005PRO_IA32_ASM_FLAGS     = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
-RELEASE_VS2005PRO_IA32_ASM_FLAGS   = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
-DEBUG_VS2005PRO_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_VS2005PRO_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
-*_VS2005PRO_IA32_ASMLINK_FLAGS     = /link /nologo /tiny\r
+DEBUG_VS2005PRO_IA32_CC_FLAGS            = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
+RELEASE_VS2005PRO_IA32_CC_FLAGS          = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
+DEBUG_VS2005PRO_IA32_PCH_FLAGS           = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
+RELEASE_VS2005PRO_IA32_PCH_FLAGS         = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+DEBUG_VS2005PRO_IA32_ASM_FLAGS           = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
+RELEASE_VS2005PRO_IA32_ASM_FLAGS         = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
+DEBUG_VS2005PRO_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+RELEASE_VS2005PRO_IA32_DLINK_FLAGS       = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+*_VS2005PRO_IA32_ASMLINK_FLAGS           = /link /nologo /tiny\r
 \r
 ##################\r
 # x64 definitions\r
 ##################\r
-*_VS2005PRO_X64_ASM_NAME       = ml64.exe\r
-*_VS2005PRO_X64_*_PATH         = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_amd64\r
-*_VS2005PRO_X64_*_DPATH        = C:\Program Files\Microsoft Visual Studio 8\VC\bin\x86_amd64;C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
-*_VS2005PRO_X64_ASMLINK_PATH   = C:\WINDDK\3790.1830\bin\bin16\\r
+*_VS2005PRO_X64_ASM_NAME            = ml64.exe\r
 \r
-DEBUG_VS2005PRO_X64_CC_FLAGS      = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Zi /Gm\r
-RELEASE_VS2005PRO_X64_CC_FLAGS    = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF\r
-DEBUG_VS2005PRO_X64_PCH_FLAGS     = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-RELEASE_VS2005PRO_X64_PCH_FLAGS   = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
-DEBUG_VS2005PRO_X64_ASM_FLAGS     = /nologo /W3 /WX /c /Cx /Zd /Zi\r
-RELEASE_VS2005PRO_X64_ASM_FLAGS   = /nologo /W3 /WX /c /Cx /Zd\r
-DEBUG_VS2005PRO_X64_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+DEBUG_VS2005PRO_X64_CC_FLAGS             = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Zi /Gm\r
+RELEASE_VS2005PRO_X64_CC_FLAGS           = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF\r
+DEBUG_VS2005PRO_X64_PCH_FLAGS            = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
+RELEASE_VS2005PRO_X64_PCH_FLAGS          = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+DEBUG_VS2005PRO_X64_ASM_FLAGS            = /nologo /W3 /WX /c /Cx /Zd /Zi\r
+RELEASE_VS2005PRO_X64_ASM_FLAGS          = /nologo /W3 /WX /c /Cx /Zd\r
+DEBUG_VS2005PRO_X64_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+RELEASE_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
 \r
 ##################\r
 # EBC definitions\r
 ##################\r
-*_VS2005PRO_EBC_*_FAMILY    = INTEL\r
-*_VS2005PRO_EBC_PP_NAME     = iec.exe\r
-*_VS2005PRO_EBC_CC_NAME     = iec.exe\r
-*_VS2005PRO_EBC_DLINK_NAME  = link.exe\r
-*_VS2005PRO_EBC_SLINK_NAME  = link.exe\r
-*_VS2005PRO_EBC_*_PATH      = C:\Program Files\Intel\EBC\Bin\r
-*_VS2005PRO_EBC_*_SPATH     = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"\r
+*_VS2005PRO_EBC_*_FAMILY            = INTEL\r
+\r
+*_VS2005PRO_EBC_PP_NAME             = iec.exe\r
+*_VS2005PRO_EBC_CC_NAME             = iec.exe\r
+*_VS2005PRO_EBC_DLINK_NAME          = link.exe\r
+*_VS2005PRO_EBC_SLINK_NAME          = link.exe\r
 \r
-*_VS2005PRO_EBC_PP_FLAGS    = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-*_VS2005PRO_EBC_CC_FLAGS    = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-*_VS2005PRO_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC\r
-*_VS2005PRO_EBC_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
+*_VS2005PRO_EBC_PP_FLAGS                 = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_VS2005PRO_EBC_CC_FLAGS                 = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_VS2005PRO_EBC_SLINK_FLAGS              = /lib /NOLOGO /MACHINE:EBC\r
+*_VS2005PRO_EBC_DLINK_FLAGS              = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
 \r
 ##################\r
 # ASL definitions\r
 ##################\r
-*_VS2005PRO_*_ASL_FAMILY  = INTEL\r
-*_VS2005PRO_*_ASL_NAME    = iasl.exe\r
-*_VS2005PRO_*_ASL_PATH    = C:\ASL\r
+*_VS2005PRO_*_ASL_FAMILY            = INTEL\r
+\r
+*_VS2005PRO_*_ASL_NAME              = iasl.exe\r
 \r
 \r
 ####################################################################################\r
@@ -423,30 +431,37 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 #\r
 ####################################################################################\r
 #   VS2005TEAMSUITE  - Microsoft Visual Studio 2005 Team Suite Edition\r
-#*_VS2005TEAMSUITE_*_*_FAMILY       = MSFT\r
-\r
-#*_VS2005TEAMSUITE_*_CC_NAME        = cl.exe\r
-#*_VS2005TEAMSUITE_*_SLINK_NAME     = lib.exe\r
-#*_VS2005TEAMSUITE_*_DLINK_NAME     = link.exe\r
-#*_VS2005TEAMSUITE_*_ASMLINK_NAME   = link.exe\r
-#*_VS2005TEAMSUITE_*_PP_NAME        = cl.exe\r
-#*_VS2005TEAMSUITE_*_APP_NAME       = cl.exe\r
-#*_VS2005TEAMSUITE_*_VFRPP_NAME     = cl.exe\r
-#*_VS2005TEAMSUITE_*_PCH_NAME       = cl.exe\r
-\r
-#*_VS2005TEAMSUITE_*_SLINK_FLAGS       = /NOLOGO /LTCG\r
-#*_VS2005TEAMSUITE_*_APP_FLAGS         = /nologo /E /TC\r
-#*_VS2005TEAMSUITE_*_PP_FLAGS          = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-#*_VS2005TEAMSUITE_*_VFRPP_FLAGS       = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+#*_VS2005TEAMSUITE_*_*_FAMILY        = MSFT\r
+#*_VS2005TEAMSUITE_IA32_*_PATH       = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
+#*_VS2005TEAMSUITE_IA32_*_DPATH      = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
+#*_VS2005TEAMSUITE_IA32_ASM_PATH     = C:\WINDDK\3790.1830\bin\x86\r
+#*_VS2005TEAMSUITE_IA32_ASMLINK_PATH = C:\WINDDK\3790.1830\bin\bin16\r
+#*_VS2005TEAMSUITE_X64_*_PATH        = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_amd64\r
+#*_VS2005TEAMSUITE_X64_*_DPATH       = C:\Program Files\Microsoft Visual Studio 8\VC\bin\x86_amd64;C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
+#*_VS2005TEAMSUITE_X64_ASMLINK_PATH  = C:\WINDDK\3790.1830\bin\bin16\r
+#*_VS2005TEAMSUITE_IPF_*_PATH        = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
+#*_VS2005TEAMSUITE_IPF_*_DPATH       = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
+*_VS2005TEAMSUITE_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin\r
+*_VS2005TEAMSUITE_*_ASL_PATH        = C:\ASL\r
+\r
+#*_VS2005TEAMSUITE_*_CC_NAME         = cl.exe\r
+#*_VS2005TEAMSUITE_*_SLINK_NAME      = lib.exe\r
+#*_VS2005TEAMSUITE_*_DLINK_NAME      = link.exe\r
+#*_VS2005TEAMSUITE_*_ASMLINK_NAME    = link.exe\r
+#*_VS2005TEAMSUITE_*_PP_NAME         = cl.exe\r
+#*_VS2005TEAMSUITE_*_APP_NAME        = cl.exe\r
+#*_VS2005TEAMSUITE_*_VFRPP_NAME      = cl.exe\r
+#*_VS2005TEAMSUITE_*_PCH_NAME        = cl.exe\r
+\r
+#*_VS2005TEAMSUITE_*_SLINK_FLAGS          = /NOLOGO /LTCG\r
+#*_VS2005TEAMSUITE_*_APP_FLAGS            = /nologo /E /TC\r
+#*_VS2005TEAMSUITE_*_PP_FLAGS             = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+#*_VS2005TEAMSUITE_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
 #*_VS2005TEAMSUITE_IA32_ASM_NAME     = ml.exe\r
-#*_VS2005TEAMSUITE_IA32_*_PATH       = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
-#*_VS2005TEAMSUITE_IA32_*_DPATH      = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
-#*_VS2005TEAMSUITE_IA32_ASM_PATH     = C:\WINDDK\3790.1830\bin\x86\r
-#*_VS2005TEAMSUITE_IA32_ASMLINK_PATH = C:\WINDDK\3790.1830\bin\bin16\\r
 \r
 #DEBUG_VS2005TEAMSUITE_IA32_CC_FLAGS      = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
 #RELEASE_VS2005TEAMSUITE_IA32_CC_FLAGS    = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
@@ -461,59 +476,53 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 ##################\r
 # x64 definitions\r
 ##################\r
-#*_VS2005TEAMSUITE_X64_ASM_NAME       = ml64.exe\r
-#*_VS2005TEAMSUITE_X64_*_PATH         = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_amd64\r
-#*_VS2005TEAMSUITE_X64_*_DPATH        = C:\Program Files\Microsoft Visual Studio 8\VC\bin\x86_amd64;C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
-#*_VS2005TEAMSUITE_X64_ASMLINK_PATH   = C:\WINDDK\3790.1830\bin\bin16\\r
+#*_VS2005TEAMSUITE_X64_ASM_NAME      = ml64.exe\r
 \r
-#DEBUG_VS2005TEAMSUITE_X64_CC_FLAGS      = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Zi /Gm\r
-#RELEASE_VS2005TEAMSUITE_X64_CC_FLAGS    = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF\r
-#DEBUG_VS2005TEAMSUITE_X64_PCH_FLAGS     = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-#RELEASE_VS2005TEAMSUITE_X64_PCH_FLAGS   = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
-#DEBUG_VS2005TEAMSUITE_X64_ASM_FLAGS     = /nologo /W3 /WX /c /Cx /Zd /Zi\r
-#RELEASE_VS2005TEAMSUITE_X64_ASM_FLAGS   = /nologo /W3 /WX /c /Cx /Zd\r
-#DEBUG_VS2005TEAMSUITE_X64_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-#RELEASE_VS2005TEAMSUITE_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+#DEBUG_VS2005TEAMSUITE_X64_CC_FLAGS       = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Zi /Gm\r
+#RELEASE_VS2005TEAMSUITE_X64_CC_FLAGS     = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF\r
+#DEBUG_VS2005TEAMSUITE_X64_PCH_FLAGS      = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
+#RELEASE_VS2005TEAMSUITE_X64_PCH_FLAGS    = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+#DEBUG_VS2005TEAMSUITE_X64_ASM_FLAGS      = /nologo /W3 /WX /c /Cx /Zd /Zi\r
+#RELEASE_VS2005TEAMSUITE_X64_ASM_FLAGS    = /nologo /W3 /WX /c /Cx /Zd\r
+#DEBUG_VS2005TEAMSUITE_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+#RELEASE_VS2005TEAMSUITE_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
 \r
 ##################\r
 # IPF definitions\r
 ##################\r
-#*_VS2005TEAMSUITE_IPF_ASM_NAME          = ias.exe\r
-#*_VS2005TEAMSUITE_IPF_*_PATH            = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
-#*_VS2005TEAMSUITE_IPF_*_DPATH           = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
+#*_VS2005TEAMSUITE_IPF_ASM_NAME      = ias.exe\r
 \r
-#*_VS2005TEAMSUITE_IPF_PP_FLAGS          = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-#DEBUG_VS2005TEAMSUITE_IPF_CC_FLAGS      = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi\r
-#RELEASE_VS2005TEAMSUITE_IPF_CC_FLAGS    = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-#DEBUG_VS2005TEAMSUITE_IPF_PCH_FLAGS     = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi\r
-#RELEASE_VS2005TEAMSUITE_IPF_PCH_FLAGS   = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
-#DEBUG_VS2005TEAMSUITE_IPF_ASM_FLAGS     = -N us -X explicit -M ilp64 -N so -W4 -d debug\r
-#RELEASE_VS2005TEAMSUITE_IPF_ASM_FLAGS   = -N us -X explicit -M ilp64 -N so -W4\r
-#DEBUG_VS2005TEAMSUITE_IPF_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /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
-#RELEASE_VS2005TEAMSUITE_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
+#*_VS2005TEAMSUITE_IPF_PP_FLAGS           = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+#DEBUG_VS2005TEAMSUITE_IPF_CC_FLAGS       = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi\r
+#RELEASE_VS2005TEAMSUITE_IPF_CC_FLAGS     = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+#DEBUG_VS2005TEAMSUITE_IPF_PCH_FLAGS      = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi\r
+#RELEASE_VS2005TEAMSUITE_IPF_PCH_FLAGS    = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+#DEBUG_VS2005TEAMSUITE_IPF_ASM_FLAGS      = -N us -X explicit -M ilp64 -N so -W4 -d debug\r
+#RELEASE_VS2005TEAMSUITE_IPF_ASM_FLAGS    = -N us -X explicit -M ilp64 -N so -W4\r
+#DEBUG_VS2005TEAMSUITE_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /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
+#RELEASE_VS2005TEAMSUITE_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
 \r
 ##################\r
 # EBC definitions\r
 ##################\r
-*_VS2005TEAMSUITE_EBC_*_FAMILY    = INTEL\r
-*_VS2005TEAMSUITE_EBC_PP_NAME     = iec.exe\r
-*_VS2005TEAMSUITE_EBC_CC_NAME     = iec.exe\r
-*_VS2005TEAMSUITE_EBC_DLINK_NAME  = link.exe\r
-*_VS2005TEAMSUITE_EBC_SLINK_NAME  = link.exe\r
-*_VS2005TEAMSUITE_EBC_*_PATH      = "C:\Program Files\Intel\EBC\Bin"\r
-*_VS2005TEAMSUITE_EBC_*_SPATH     = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"\r
+*_VS2005TEAMSUITE_EBC_*_FAMILY      = INTEL\r
 \r
-*_VS2005TEAMSUITE_EBC_PP_FLAGS    = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-*_VS2005TEAMSUITE_EBC_CC_FLAGS    = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-*_VS2005TEAMSUITE_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC\r
-*_VS2005TEAMSUITE_EBC_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
+*_VS2005TEAMSUITE_EBC_PP_NAME       = iec.exe\r
+*_VS2005TEAMSUITE_EBC_CC_NAME       = iec.exe\r
+*_VS2005TEAMSUITE_EBC_DLINK_NAME    = link.exe\r
+*_VS2005TEAMSUITE_EBC_SLINK_NAME    = link.exe\r
+\r
+*_VS2005TEAMSUITE_EBC_PP_FLAGS           = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_VS2005TEAMSUITE_EBC_CC_FLAGS           = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_VS2005TEAMSUITE_EBC_SLINK_FLAGS        = /lib /NOLOGO /MACHINE:EBC\r
+*_VS2005TEAMSUITE_EBC_DLINK_FLAGS        = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
 \r
 ##################\r
 # ASL definitions\r
 ##################\r
-*_VS2005TEAMSUITE_*_ASL_FAMILY  = INTEL\r
-*_VS2005TEAMSUITE_*_ASL_NAME    = iasl.exe\r
-*_VS2005TEAMSUITE_*_ASL_PATH    = C:\ASL\r
+*_VS2005TEAMSUITE_*_ASL_FAMILY      = INTEL\r
+\r
+*_VS2005TEAMSUITE_*_ASL_NAME        = iasl.exe\r
 \r
 \r
 ####################################################################################\r
@@ -522,36 +531,36 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 #\r
 ####################################################################################\r
 #   UINIXGCC         - UINIX GCC\r
+*_UNIXGCC_IA32_*_FAMILY             = GCC\r
 \r
-*_UNIXGCC_IA32_*_FAMILY        = GCC\r
+*_UNIXGCC_IA32_*_PATH               = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
+*_UNIXGCC_X64_*_PATH                = /opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin\r
 \r
-*_UNIXGCC_IA32_*_PATH       = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
-*_UNIXGCC_IA32_CC_NAME      = gcc\r
-*_UNIXGCC_IA32_SLINK_NAME   = ar\r
-*_UNIXGCC_IA32_DLINK_NAME   = ld\r
-*_UNIXGCC_IA32_ASM_NAME     = gcc\r
-*_UNIXGCC_IA32_PP_NAME      = gcc\r
-*_UNIXGCC_IA32_VFRPP_NAME   = gcc\r
-*_UNIXGCC_IA32_CC_FLAGS     = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include $(DEST_DIR_DEBUG)/AutoGen.h\r
+*_UNIXGCC_IA32_CC_NAME              = gcc\r
+*_UNIXGCC_IA32_SLINK_NAME           = ar\r
+*_UNIXGCC_IA32_DLINK_NAME           = ld\r
+*_UNIXGCC_IA32_ASM_NAME             = gcc\r
+*_UNIXGCC_IA32_PP_NAME              = gcc\r
+*_UNIXGCC_IA32_VFRPP_NAME           = gcc\r
+*_UNIXGCC_IA32_CC_FLAGS                  = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include $(DEST_DIR_DEBUG)/AutoGen.h\r
 \r
 ##################\r
 # x64 definitions\r
 ##################\r
-*_UNIXGCC_X64_*_FAMILY        = GCC\r
+*_UNIXGCC_X64_*_FAMILY              = GCC\r
 \r
-*_UNIXGCC_X64_*_PATH        = /opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin\r
-*_UNIXGCC_X64_CC_NAME       = gcc\r
-*_UNIXGCC_X64_SLINK_NAME    = ar\r
-*_UNIXGCC_X64_DLINK_NAME    = ld\r
-*_UNIXGCC_X64_ASM_NAME      = gcc\r
-*_UNIXGCC_X64_PP_NAME       = gcc\r
-*_UNIXGCC_X64_VFRPP_NAME    = gcc\r
-*_UNIXGCC_X64_CC_FLAGS      = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include $(DEST_DIR_DEBUG)/AutoGen.h -D_EFI_P64\r
+*_UNIXGCC_X64_CC_NAME               = gcc\r
+*_UNIXGCC_X64_SLINK_NAME            = ar\r
+*_UNIXGCC_X64_DLINK_NAME            = ld\r
+*_UNIXGCC_X64_ASM_NAME              = gcc\r
+*_UNIXGCC_X64_PP_NAME               = gcc\r
+*_UNIXGCC_X64_VFRPP_NAME            = gcc\r
+*_UNIXGCC_X64_CC_FLAGS                   = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include $(DEST_DIR_DEBUG)/AutoGen.h -D_EFI_P64\r
 \r
-*_UNIXGCC_*_DLINK_FLAGS     = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _$(ENTRYPOINT) --file-alignment 0x20 --section-alignment 0x20\r
-*_UNIXGCC_*_ASM_FLAGS       = -c -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_*_DLINK_FLAGS                  = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _$(ENTRYPOINT) --file-alignment 0x20 --section-alignment 0x20\r
+*_UNIXGCC_*_ASM_FLAGS                    = -c -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
 \r
 \r
 ####################################################################################\r
@@ -560,34 +569,39 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 #\r
 ####################################################################################\r
 #   CYGWINGCC        - CygWin GCC\r
-*_CYGWINGCC_IA32_*_FAMILY     = GCC\r
+*_CYGWINGCC_IA32_*_FAMILY           = GCC\r
+\r
+*_CYGWINGCC_IA32_*_PATH             = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
+*_CYGWINGCC_X64_*_PATH              = /opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin\r
+*_CYGWINGCC_*_*_DPATH               = /bin\r
+*_CYGWINGCC_*_ASL_PATH              = /cygdrive/c/ASL\r
 \r
-*_CYGWINGCC_IA32_CC_NAME      = gcc\r
-*_CYGWINGCC_IA32_*_PATH       = c:/Cygwin/opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
-*_CYGWINGCC_IA32_SLINK_NAME   = ar\r
-*_CYGWINGCC_IA32_DLINK_NAME   = ld\r
-*_CYGWINGCC_IA32_ASM_NAME     = gcc\r
-*_CYGWINGCC_IA32_PP_NAME      = gcc\r
-*_CYGWINGCC_IA32_VFRPP_NAME   = gcc\r
-*_CYGWINGCC_IA32_CC_FLAGS     = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include $(DEST_DIR_DEBUG)/AutoGen.h\r
+*_CYGWINGCC_IA32_CC_NAME            = gcc\r
+*_CYGWINGCC_IA32_SLINK_NAME         = ar\r
+*_CYGWINGCC_IA32_DLINK_NAME         = ld\r
+*_CYGWINGCC_IA32_ASM_NAME           = gcc\r
+*_CYGWINGCC_IA32_PP_NAME            = gcc\r
+*_CYGWINGCC_IA32_VFRPP_NAME         = gcc\r
+*_CYGWINGCC_IA32_ASL_NAME           = iasl.exe\r
 \r
+*_CYGWINGCC_IA32_CC_FLAGS                = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include $(DEST_DIR_DEBUG)/AutoGen.h\r
 \r
-*_CYGWINGCC_X64_*_FAMILY      = GCC\r
-*_CYGWINGCC_X64_*_PATH        = c:/Cygwin/opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin\r
-*_CYGWINGCC_X64_CC_NAME       = gcc\r
-*_CYGWINGCC_X64_SLINK_NAME    = ar\r
-*_CYGWINGCC_X64_DLINK_NAME    = ld\r
-*_CYGWINGCC_X64_ASM_NAME      = gcc\r
-*_CYGWINGCC_X64_PP_NAME       = gcc\r
-*_CYGWINGCC_X64_VFRPP_NAME    = gcc\r
 \r
-*_CYGWINGCC_X64_CC_FLAGS      = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include $(DEST_DIR_DEBUG)/AutoGen.h -D_EFI_P64\r
-*_CYGWINGCC_*_DLINK_FLAGS     = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _$(ENTRYPOINT) --file-alignment 0x20 --section-alignment 0x20\r
-*_CYGWINGCC_*_ASM_FLAGS       = -c -imacros $(DEST_DIR_DEBUG)/AutoGen.h\r
-*_CYGWINGCC_*_PP_FLAGS        = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
-*_CYGWINGCC_*_VFRPP_FLAGS     = -x c -E -P -DVFRCOMPILE --include AutoGen.h\r
+*_CYGWINGCC_X64_*_FAMILY            = GCC\r
+*_CYGWINGCC_X64_CC_NAME             = gcc\r
+*_CYGWINGCC_X64_SLINK_NAME          = ar\r
+*_CYGWINGCC_X64_DLINK_NAME          = ld\r
+*_CYGWINGCC_X64_ASM_NAME            = gcc\r
+*_CYGWINGCC_X64_PP_NAME             = gcc\r
+*_CYGWINGCC_X64_VFRPP_NAME          = gcc\r
+*_CYGWINGCC_X64_ASL_NAME            = iasl.exe\r
+\r
+*_CYGWINGCC_X64_CC_FLAGS                 = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include $(DEST_DIR_DEBUG)/AutoGen.h -D_EFI_P64\r
+*_CYGWINGCC_*_DLINK_FLAGS                = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _$(ENTRYPOINT) --file-alignment 0x20 --section-alignment 0x20\r
+*_CYGWINGCC_*_ASM_FLAGS                  = -c -imacros $(DEST_DIR_DEBUG)/AutoGen.h\r
+*_CYGWINGCC_*_PP_FLAGS                   = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
+*_CYGWINGCC_*_VFRPP_FLAGS                = -x c -E -P -DVFRCOMPILE --include AutoGen.h\r
 \r
-*_CYGWINGCC_*_*_DPATH         = c:/Cygwin/bin\r
 \r
 ####################################################################################\r
 #\r
@@ -596,60 +610,62 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 #\r
 ####################################################################################\r
 #   ELFGCC           - Linux ELF GCC\r
-*_ELFGCC_*_*_FAMILY        = GCC\r
+*_ELFGCC_*_*_FAMILY                 = GCC\r
+*_ELFGCC_IA32_*_PATH                = /usr/bin\r
 \r
-*_ELFGCC_IA32_CC_NAME      = gcc\r
-*_ELFGCC_IA32_SLINK_NAME   = ar\r
-*_ELFGCC_IA32_DLINK_NAME   = ld\r
-*_ELFGCC_IA32_ASM_NAME     = gcc\r
-*_ELFGCC_IA32_PP_NAME      = gcc\r
-*_ELFGCC_IA32_VFRPP_NAME   = gcc\r
+*_ELFGCC_IA32_CC_NAME               = gcc\r
+*_ELFGCC_IA32_SLINK_NAME            = ar\r
+*_ELFGCC_IA32_DLINK_NAME            = ld\r
+*_ELFGCC_IA32_ASM_NAME              = gcc\r
+*_ELFGCC_IA32_PP_NAME               = gcc\r
+*_ELFGCC_IA32_VFRPP_NAME            = gcc\r
 \r
-*_ELFGCC_IA32_CC_FLAGS     = -m32 -g -fshort-wchar -fno-strict-aliasing -Wall -malign-double -c -include $(DEST_DIR_DEBUG)/AutoGen.h -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings\r
-*_ELFGCC_*_DLINK_FLAGS     = -melf_i386 -nostdlib -n -q -Ttext 0x220 --entry $(ENTRYPOINT) -u $(ENTRYPOINT)\r
-*_ELFGCC_*_ASM_FLAGS       = -m32 -c -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_IA32_CC_FLAGS                   = -m32 -g -fshort-wchar -fno-strict-aliasing -Wall -malign-double -c -include $(DEST_DIR_DEBUG)/AutoGen.h -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings\r
+*_ELFGCC_*_DLINK_FLAGS                   = -melf_i386 -nostdlib -n -q -Ttext 0x220 --entry $(ENTRYPOINT) -u $(ENTRYPOINT)\r
+*_ELFGCC_*_ASM_FLAGS                     = -m32 -c -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
 \r
-*_ELFGCC_IA32_*_PATH       = /usr/bin\r
 \r
 ####################################################################################\r
 #\r
 # Intel EFI Byte Code Compiler (Template)\r
 #\r
 ####################################################################################\r
+# *_*_EBC_*_FAMILY                   = INTEL\r
+#\r
+# *_*_EBC_*_PATH                     = C:\Program Files\Intel\EBC\Bin\r
 #\r
-# *_*_EBC_*_FAMILY     = INTEL\r
-# *_*_EBC_PP_NAME      = iec.exe\r
-# *_*_EBC_CC_NAME      = iec.exe\r
-# *_*_EBC_SLINK_NAME   = link.exe\r
-# *_*_EBC_*_PATH       = C:\Program Files\Intel\EBC\Bin\r
-# *_*_EBC_*_SPATH      = C:\Program Files\Intel\EBC\Lib\EbcLib.lib\r
+# *_*_EBC_PP_NAME                    = iec.exe\r
+# *_*_EBC_CC_NAME                    = iec.exe\r
+# *_*_EBC_SLINK_NAME                 = link.exe\r
 #\r
-# *_*_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC\r
-# *_*_EBC_PP_FLAGS      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-# *_*_EBC_CC_FLAGS      = /nologo /FAcs /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-# *_*_EBC_DLINK_FLAGS   = /NOLOGO /MACHINE:EBC /OPT:REF /NODEFAULTLIB /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
+# *_*_EBC_SLINK_FLAGS                     = /lib /NOLOGO /MACHINE:EBC\r
+# *_*_EBC_PP_FLAGS                        = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+# *_*_EBC_CC_FLAGS                        = /nologo /FAcs /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+# *_*_EBC_DLINK_FLAGS                     = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /MACHINE:EBC /OPT:REF /NODEFAULTLIB /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
 #\r
 ####################################################################################\r
 #\r
 # Intel ACPI Source Language Compiler (Template)\r
 #\r
 ####################################################################################\r
+# *_*_*_ASL_FAMILY                   = INTEL\r
+#\r
+# *_*_*_ASL_PATH                     = C:\ASL\r
 #\r
-# *_*_*_ASL_FAMILY  = INTEL\r
-# *_*_*_ASL_NAME    = iasl.exe\r
-# *_*_*_ASL_PATH    = C:\ASL\r
+# *_*_*_ASL_NAME                     = iasl.exe\r
 #\r
 ####################################################################################\r
 #\r
 # Microsoft ACPI Source Language Compiler (Template)\r
 #\r
 ####################################################################################\r
+# *_*_*_ASL_FAMILY                   = MSFT\r
 #\r
-# *_*_*_ASL_FAMILY  = MSFT\r
-# *_*_*_ASL_NAME    = asl.exe\r
-# *_*_*_ASL_PATH    = C:\ASL\r
+# *_*_*_ASL_PATH                     = C:\ASL\r
+#\r
+# *_*_*_ASL_NAME                     = asl.exe\r
 #\r
 \r
 \r
@@ -662,75 +678,77 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 #\r
 ####################################################################################\r
 #   ICC              - Intel C Compiler V9.1\r
-*_ICC_*_*_FAMILY             = MSFT\r
+*_ICC_*_*_FAMILY                    = MSFT\r
+\r
+*_ICC_IA32_*_PATH                   = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
+*_ICC_IA32_*_DPATH                  = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r
+*_ICC_IA32_ASMLINK_PATH             = C:\WINDDK\3790.1830\bin\bin16\r
+*_ICC_IPF_*_PATH                    = C:\Program Files\Intel\Compiler\C++\9.1\Itanium\Bin\r
+DEBUG_ICC_*_ASL_PATH                = C:\ASL\r
+RELEASE_ICC_*_ASL_PATH              = C:\ASL\r
 \r
-*_ICC_*_CC_NAME              = cl.exe\r
-*_ICC_*_SLINK_NAME           = lib.exe\r
-*_ICC_*_DLINK_NAME           = link.exe\r
-*_ICC_*_ASMLINK_NAME         = link.exe\r
-*_ICC_*_PP_NAME              = cl.exe\r
-*_ICC_*_VFRPP_NAME           = cl.exe\r
-*_ICC_*_APP_NAME             = cl.exe\r
-*_ICC_*_ASM_NAME             = ml.exe\r
+*_ICC_*_CC_NAME                     = cl.exe\r
+*_ICC_*_SLINK_NAME                  = lib.exe\r
+*_ICC_*_DLINK_NAME                  = link.exe\r
+*_ICC_*_ASMLINK_NAME                = link.exe\r
+*_ICC_*_PP_NAME                     = cl.exe\r
+*_ICC_*_VFRPP_NAME                  = cl.exe\r
+*_ICC_*_APP_NAME                    = cl.exe\r
+*_ICC_*_ASM_NAME                    = ml.exe\r
 \r
-*_ICC_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+*_ICC_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_ICC_IA32_*_PATH            = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
-*_ICC_IA32_PCH_NAME          = cl.exe\r
-*_ICC_IA32_*_DPATH           = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r
-*_ICC_IA32_ASMLINK_PATH      = C:\WINDDK\3790.1830\bin\bin16\\r
+*_ICC_IA32_PCH_NAME                 = cl.exe\r
 \r
-*_ICC_IA32_APP_FLAGS         = /nologo /E /TC\r
-*_ICC_IA32_PP_FLAGS          = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-DEBUG_ICC_IA32_CC_FLAGS      = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
-RELEASE_ICC_IA32_CC_FLAGS    = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
-DEBUG_ICC_IA32_PCH_FLAGS     = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Yc /TC /Zi /Gm\r
-RELEASE_ICC_IA32_PCH_FLAGS   = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Yc /TC\r
-DEBUG_ICC_IA32_ASM_FLAGS     = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
-RELEASE_ICC_IA32_ASM_FLAGS   = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
-*_ICC_IA32_SLINK_FLAGS       = /nologo /LTCG\r
-DEBUG_ICC_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_ICC_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+*_ICC_IA32_APP_FLAGS                     = /nologo /E /TC\r
+*_ICC_IA32_PP_FLAGS                      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+DEBUG_ICC_IA32_CC_FLAGS                  = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
+RELEASE_ICC_IA32_CC_FLAGS                = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
+DEBUG_ICC_IA32_PCH_FLAGS                 = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Yc /TC /Zi /Gm\r
+RELEASE_ICC_IA32_PCH_FLAGS               = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Yc /TC\r
+DEBUG_ICC_IA32_ASM_FLAGS                 = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
+RELEASE_ICC_IA32_ASM_FLAGS               = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
+*_ICC_IA32_SLINK_FLAGS                   = /nologo /LTCG\r
+DEBUG_ICC_IA32_DLINK_FLAGS               = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+RELEASE_ICC_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
 \r
 ##################\r
 # IPF definitions\r
 ##################\r
-*_ICC_IPF_*_FAMILY  = INTEL\r
-*_ICC_IPF_*_PATH            = C:\Program Files\Intel\Compiler\C++\9.1\Itanium\Bin\r
-\r
-*_ICC_IPF_CC_NAME           = icl.exe\r
-*_ICC_IPF_SLINK_NAME        = xilib.exe\r
-*_ICC_IPF_DLINK_NAME        = xilink.exe\r
-*_ICC_IPF_ASMLINK_NAME      = xilink.exe\r
-*_ICC_IPF_PP_NAME           = icl.exe\r
-*_ICC_IPF_VFRPP_NAME        = icl.exe\r
-\r
-#*_ICC_IPF_PCH_NAME          = icl.exe\r
-*_ICC_IPF_APP_NAME          = icl.exe\r
-*_ICC_IPF_ASM_NAME          = ias.exe\r
-\r
-*_ICC_IPF_APP_FLAGS         = /nologo /E /TC\r
-*_ICC_IPF_PP_FLAGS          = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-DEBUG_ICC_IPF_CC_FLAGS      = /nologo /W4 /WX /GX /Gy /c /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 /Zi\r
-RELEASE_ICC_IPF_CC_FLAGS    = /nologo /W4 /WX /GX /Gy /c /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 \r
-#DEBUG_ICC_IPF_PCH_FLAGS     = /nologo /W4 /WX /GX /Gy /c /Os /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC /Zi\r
-#RELEASE_ICC_IPF_PCH_FLAGS   = /nologo /W4 /WX /GX /Gy /c /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:$(ENTRYPOINT) /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
-RELEASE_ICC_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:64 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
-*_ICC_IPF_SLINK_FLAGS       = /nologo /LTCG\r
+*_ICC_IPF_*_FAMILY                  = INTEL\r
+\r
+*_ICC_IPF_CC_NAME                   = icl.exe\r
+*_ICC_IPF_SLINK_NAME                = xilib.exe\r
+*_ICC_IPF_DLINK_NAME                = xilink.exe\r
+*_ICC_IPF_ASMLINK_NAME              = xilink.exe\r
+*_ICC_IPF_PP_NAME                   = icl.exe\r
+*_ICC_IPF_VFRPP_NAME                = icl.exe\r
+\r
+#*_ICC_IPF_PCH_NAME                  = icl.exe\r
+*_ICC_IPF_APP_NAME                  = icl.exe\r
+*_ICC_IPF_ASM_NAME                  = ias.exe\r
+\r
+*_ICC_IPF_APP_FLAGS                      = /nologo /E /TC\r
+*_ICC_IPF_PP_FLAGS                       = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+DEBUG_ICC_IPF_CC_FLAGS                   = /nologo /W4 /WX /GX /Gy /c /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 /Zi\r
+RELEASE_ICC_IPF_CC_FLAGS                 = /nologo /W4 /WX /GX /Gy /c /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 \r
+#DEBUG_ICC_IPF_PCH_FLAGS                  = /nologo /W4 /WX /GX /Gy /c /Os /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC /Zi\r
+#RELEASE_ICC_IPF_PCH_FLAGS                = /nologo /W4 /WX /GX /Gy /c /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:$(ENTRYPOINT) /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
+RELEASE_ICC_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:64 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
+*_ICC_IPF_SLINK_FLAGS                    = /nologo /LTCG\r
 \r
 ##################\r
 # ASL definitions\r
 ##################\r
-*_ICC_*_ASL_FAMILY  = INTEL\r
-*_ICC_*_ASL_NAME    = iasl.exe\r
-DEBUG_ICC_*_ASL_PATH    = C:\ASL\r
-RELEASE_ICC_*_ASL_PATH  = C:\ASL\r
+*_ICC_*_ASL_FAMILY                  = INTEL\r
+\r
+*_ICC_*_ASL_NAME                    = iasl.exe\r
 \r
 ####################################################################################\r
 #\r
@@ -743,114 +761,108 @@ RELEASE_ICC_*_ASL_PATH  = C:\ASL
 #\r
 ####################################################################################\r
 #   MYTOOLS          - Settings compatible with previous versions of tools_def.template\r
-*_MYTOOLS_*_*_FAMILY             = MSFT\r
-\r
-*_MYTOOLS_*_CC_NAME              = cl.exe\r
-*_MYTOOLS_*_SLINK_NAME           = lib.exe\r
-*_MYTOOLS_*_DLINK_NAME           = link.exe\r
-*_MYTOOLS_*_ASMLINK_NAME         = link.exe\r
-*_MYTOOLS_*_PP_NAME              = cl.exe\r
-*_MYTOOLS_*_VFRPP_NAME           = cl.exe\r
-*_MYTOOLS_*_APP_NAME             = cl.exe\r
-*_MYTOOLS_*_ASM_NAME             = ml.exe\r
-\r
-*_MYTOOLS_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
-\r
-*_MYTOOLS_*_LZMA_NAME = LzmaCompress.exe\r
-*_MYTOOLS_*_LZMA_GUID = EE4E5898-3914-4259-9D6E-DC7BD79403CF\r
-DEBUG_MYTOOLS_*_LZMA_PATH =\r
-RELEASE_MYTOOLS_*_LZMA_PATH =\r
-\r
-*_MYTOOLS_*_TIANO_NAME = TianoCompress.exe\r
-*_MYTOOLS_*_TIANO_GUID = A31280AD-481E-41B6-95E8-127F4C984779\r
-DEBUG_MYTOOLS_*_TIANO_PATH = \r
-RELEASE_MYTOOLS_*_TIANO_PATH = \r
+*_MYTOOLS_*_*_FAMILY                = MSFT\r
+\r
+DEBUG_MYTOOLS_*_TIANO_PATH          = \r
+RELEASE_MYTOOLS_*_TIANO_PATH        = \r
+*_MYTOOLS_IA32_*_PATH               = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
+*_MYTOOLS_IA32_*_DPATH              = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r
+*_MYTOOLS_IA32_ASMLINK_PATH         = C:\WINDDK\3790.1830\bin\bin16\r
+*_MYTOOLS_X64_*_PATH                = C:\WINDDK\3790.1830\bin\win64\x86\amd64\r
+*_MYTOOLS_X64_ASMLINK_PATH          = C:\WINDDK\3790.1830\bin\bin16\r
+*_MYTOOLS_IPF_*_PATH                = C:\WINDDK\3790.1830\bin\win64\x86\r
+*_MYTOOLS_EBC_*_PATH                = C:\Program Files\Intel\EBC\Bin\r
+DEBUG_MYTOOLS_*_ASL_PATH            = C:\ASL\r
+RELEASE_MYTOOLS_*_ASL_PATH          = C:\ASL\r
+\r
+*_MYTOOLS_*_CC_NAME                 = cl.exe\r
+*_MYTOOLS_*_SLINK_NAME              = lib.exe\r
+*_MYTOOLS_*_DLINK_NAME              = link.exe\r
+*_MYTOOLS_*_ASMLINK_NAME            = link.exe\r
+*_MYTOOLS_*_PP_NAME                 = cl.exe\r
+*_MYTOOLS_*_VFRPP_NAME              = cl.exe\r
+*_MYTOOLS_*_APP_NAME                = cl.exe\r
+*_MYTOOLS_*_ASM_NAME                = ml.exe\r
+\r
+*_MYTOOLS_*_VFRPP_FLAGS                  = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+\r
+*_MYTOOLS_*_TIANO_NAME              = TianoCompress.exe\r
+*_MYTOOLS_*_TIANO_GUID                   = A31280AD-481E-41B6-95E8-127F4C984779\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_MYTOOLS_IA32_PCH_NAME          = cl.exe\r
-\r
-*_MYTOOLS_IA32_*_PATH            = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
-*_MYTOOLS_IA32_*_DPATH           = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r
-*_MYTOOLS_IA32_ASMLINK_PATH      = C:\WINDDK\3790.1830\bin\bin16\\r
+*_MYTOOLS_IA32_PCH_NAME             = cl.exe\r
 \r
-*_MYTOOLS_IA32_APP_FLAGS         = /nologo /E /TC\r
-*_MYTOOLS_IA32_PP_FLAGS          = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-DEBUG_MYTOOLS_IA32_CC_FLAGS      = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
-RELEASE_MYTOOLS_IA32_CC_FLAGS    = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
-DEBUG_MYTOOLS_IA32_PCH_FLAGS     = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-RELEASE_MYTOOLS_IA32_PCH_FLAGS   = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
-DEBUG_MYTOOLS_IA32_ASM_FLAGS     = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
-RELEASE_MYTOOLS_IA32_ASM_FLAGS   = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
-*_MYTOOLS_IA32_ASMLINK_FLAGS     = /link /nologo /tiny\r
-*_MYTOOLS_IA32_SLINK_FLAGS       = /nologo /LTCG\r
-DEBUG_MYTOOLS_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
-RELEASE_MYTOOLS_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
+*_MYTOOLS_IA32_APP_FLAGS                 = /nologo /E /TC\r
+*_MYTOOLS_IA32_PP_FLAGS                  = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+DEBUG_MYTOOLS_IA32_CC_FLAGS              = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
+RELEASE_MYTOOLS_IA32_CC_FLAGS            = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
+DEBUG_MYTOOLS_IA32_PCH_FLAGS             = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
+RELEASE_MYTOOLS_IA32_PCH_FLAGS           = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+DEBUG_MYTOOLS_IA32_ASM_FLAGS             = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
+RELEASE_MYTOOLS_IA32_ASM_FLAGS           = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
+*_MYTOOLS_IA32_ASMLINK_FLAGS             = /link /nologo /tiny\r
+*_MYTOOLS_IA32_SLINK_FLAGS               = /nologo /LTCG\r
+DEBUG_MYTOOLS_IA32_DLINK_FLAGS           = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
+RELEASE_MYTOOLS_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
 \r
 ##################\r
 # x64 definitions\r
 ##################\r
-*_MYTOOLS_X64_PCH_NAME          = cl.exe\r
-*_MYTOOLS_X64_ASM_NAME          = ml64.exe\r
+*_MYTOOLS_X64_PCH_NAME              = cl.exe\r
+*_MYTOOLS_X64_ASM_NAME              = ml64.exe\r
 \r
-*_MYTOOLS_X64_*_PATH            = C:\WINDDK\3790.1830\bin\win64\x86\amd64\r
-*_MYTOOLS_X64_ASMLINK_PATH      = C:\WINDDK\3790.1830\bin\bin16\\r
-\r
-*_MYTOOLS_X64_SLINK_FLAGS       = /nologo /LTCG\r
-*_MYTOOLS_X64_APP_FLAGS         = /nologo /E /TC\r
-*_MYTOOLS_X64_PP_FLAGS          = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-DEBUG_MYTOOLS_X64_CC_FLAGS      = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF\r
-RELEASE_MYTOOLS_X64_CC_FLAGS    = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF\r
-DEBUG_MYTOOLS_X64_PCH_FLAGS     = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /Zi /Gm /EHs-c- /GF\r
-RELEASE_MYTOOLS_X64_PCH_FLAGS   = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /EHs-c- /GF\r
-DEBUG_MYTOOLS_X64_ASM_FLAGS     = /nologo /W3 /WX /c /Cx /Zd /Zi\r
-RELEASE_MYTOOLS_X64_ASM_FLAGS   = /nologo /W3 /WX /c /Cx /Zd\r
-DEBUG_MYTOOLS_X64_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_MYTOOLS_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+*_MYTOOLS_X64_SLINK_FLAGS                = /nologo /LTCG\r
+*_MYTOOLS_X64_APP_FLAGS                  = /nologo /E /TC\r
+*_MYTOOLS_X64_PP_FLAGS                   = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+DEBUG_MYTOOLS_X64_CC_FLAGS               = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF\r
+RELEASE_MYTOOLS_X64_CC_FLAGS             = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF\r
+DEBUG_MYTOOLS_X64_PCH_FLAGS              = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /Zi /Gm /EHs-c- /GF\r
+RELEASE_MYTOOLS_X64_PCH_FLAGS            = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /EHs-c- /GF\r
+DEBUG_MYTOOLS_X64_ASM_FLAGS              = /nologo /W3 /WX /c /Cx /Zd /Zi\r
+RELEASE_MYTOOLS_X64_ASM_FLAGS            = /nologo /W3 /WX /c /Cx /Zd\r
+DEBUG_MYTOOLS_X64_DLINK_FLAGS            = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+RELEASE_MYTOOLS_X64_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
 \r
 ##################\r
 # IPF definitions\r
 ##################\r
-*_MYTOOLS_IPF_PCH_NAME          = cl.exe\r
-*_MYTOOLS_IPF_ASM_NAME          = ias.exe\r
-*_MYTOOLS_IPF_ASM_OUTPUT        = "-o "\r
+*_MYTOOLS_IPF_PCH_NAME              = cl.exe\r
+*_MYTOOLS_IPF_ASM_NAME              = ias.exe\r
 \r
-*_MYTOOLS_IPF_*_PATH            = C:\WINDDK\3790.1830\bin\win64\x86\r
+*_MYTOOLS_IPF_ASM_OUTPUT                 = "-o "\r
 \r
-*_MYTOOLS_IPF_APP_FLAGS         = /nologo /E /TC\r
-*_MYTOOLS_IPF_PP_FLAGS          = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-DEBUG_MYTOOLS_IPF_CC_FLAGS      = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Zx\r
-RELEASE_MYTOOLS_IPF_CC_FLAGS    = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zx\r
-DEBUG_MYTOOLS_IPF_PCH_FLAGS     = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /Zi /Zx\r
-RELEASE_MYTOOLS_IPF_PCH_FLAGS   = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC /Zx\r
-DEBUG_MYTOOLS_IPF_ASM_FLAGS     = -N us -X explicit -M ilp64 -N so -W4 -d debug\r
-RELEASE_MYTOOLS_IPF_ASM_FLAGS   = -N us -X explicit -M ilp64 -N so -W4\r
-DEBUG_MYTOOLS_IPF_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF /OPT:ICF=10 /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /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
-RELEASE_MYTOOLS_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF /OPT:ICF=10 /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
-*_MYTOOLS_IPF_SLINK_FLAGS       = /nologo /LTCG\r
+*_MYTOOLS_IPF_APP_FLAGS                  = /nologo /E /TC\r
+*_MYTOOLS_IPF_PP_FLAGS                   = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+DEBUG_MYTOOLS_IPF_CC_FLAGS               = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Zx\r
+RELEASE_MYTOOLS_IPF_CC_FLAGS             = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zx\r
+DEBUG_MYTOOLS_IPF_PCH_FLAGS              = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /Zi /Zx\r
+RELEASE_MYTOOLS_IPF_PCH_FLAGS            = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC /Zx\r
+DEBUG_MYTOOLS_IPF_ASM_FLAGS              = -N us -X explicit -M ilp64 -N so -W4 -d debug\r
+RELEASE_MYTOOLS_IPF_ASM_FLAGS            = -N us -X explicit -M ilp64 -N so -W4\r
+DEBUG_MYTOOLS_IPF_DLINK_FLAGS            = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF /OPT:ICF=10 /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /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
+RELEASE_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF /OPT:ICF=10 /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
+*_MYTOOLS_IPF_SLINK_FLAGS                = /nologo /LTCG\r
 \r
 ##################\r
 # EBC definitions\r
 ##################\r
-*_MYTOOLS_EBC_*_FAMILY      = INTEL\r
-*_MYTOOLS_EBC_PP_NAME       = iec.exe\r
-*_MYTOOLS_EBC_CC_NAME       = iec.exe\r
-*_MYTOOLS_EBC_DLINK_NAME    = link.exe\r
-*_MYTOOLS_EBC_SLINK_NAME    = link.exe\r
+*_MYTOOLS_EBC_*_FAMILY              = INTEL\r
 \r
-*_MYTOOLS_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin\r
-*_MYTOOLS_EBC_*_SPATH       = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"\r
+*_MYTOOLS_EBC_PP_NAME               = iec.exe\r
+*_MYTOOLS_EBC_CC_NAME               = iec.exe\r
+*_MYTOOLS_EBC_DLINK_NAME            = link.exe\r
+*_MYTOOLS_EBC_SLINK_NAME            = link.exe\r
 \r
-*_MYTOOLS_EBC_PP_FLAGS      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-*_MYTOOLS_EBC_CC_FLAGS      = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-*_MYTOOLS_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC\r
-*_MYTOOLS_EBC_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
+*_MYTOOLS_EBC_PP_FLAGS                   = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_MYTOOLS_EBC_CC_FLAGS                   = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.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:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
 \r
 ##################\r
 # ASL definitions\r
 ##################\r
-*_MYTOOLS_*_ASL_FAMILY  = INTEL\r
-*_MYTOOLS_*_ASL_NAME    = iasl.exe\r
-DEBUG_MYTOOLS_*_ASL_PATH    = C:\ASL\r
-RELEASE_MYTOOLS_*_ASL_PATH  = C:\ASL\r
+*_MYTOOLS_*_ASL_FAMILY              = INTEL\r
+\r
+*_MYTOOLS_*_ASL_NAME                = iasl.exe\r