1) Implemented MACRO in tools_def.txt

2) Added library without library class support
3) Fixed the issue in Trim tool which zero file will be generated if the trimmed file has not line directive

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

diff --git a/BaseTools/Bin/Win32/GenFds.exe b/BaseTools/Bin/Win32/GenFds.exe
index c8121ba313a510bcce8038572150654e84bae0e7..983e59a4e045f35717c432c8d8e7f5cdd40eb68a 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenFds.exe and b/BaseTools/Bin/Win32/GenFds.exe differ

diff --git a/BaseTools/Bin/Win32/Trim.exe b/BaseTools/Bin/Win32/Trim.exe
index 10a675af05da39c3d8498ee123c48088fef7cfc1..a092e404e997c4fab1cf7bcafa92643a739e3bc5 100755 (executable)
Binary files a/BaseTools/Bin/Win32/Trim.exe and b/BaseTools/Bin/Win32/Trim.exe differ

diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index f6068ae5a5508008edff9ea4d75c0b8e8a997858..ac13631ca04ad763abfe53a99b1ceab39b2cb974 100755 (executable)
Binary files a/BaseTools/Bin/Win32/build.exe and b/BaseTools/Bin/Win32/build.exe differ

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 80262f97918e26027a07f065478ff33a1ea6fe06..d4cfae66005c259a0c553db0a6229a8bce7c87c0 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -12,6 +12,37 @@
 \r
 IDENTIFIER = Default TOOL_CHAIN_CONF\r
 \r
+# common path macros\r
+DEFINE VSNET_BIN = C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin\r
+DEFINE VSNET_DLL = C:\Program Files\Microsoft Visual Studio .NET\Common7\IDE\r
+\r
+DEFINE VSNET2003_BIN = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
+DEFINE VSNET2003_DLL = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r
+\r
+DEFINE VS2005EXP_BIN = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
+DEFINE VS2005STD_BIN = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
+DEFINE VS2005PRO_BIN = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
+DEFINE VS2005TS_BIN  = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
+\r
+DEFINE WINDDK_BIN16   = C:\WINDDK\3790.1830\bin\bin16\r
+DEFINE WINDDK_BIN32   = C:\WINDDK\3790.1830\bin\x86\r
+DEFINE WINDDK_BINX64  = C:\WINDDK\3790.1830\bin\win64\x86\amd64\r
+DEFINE WINDDK_BIN64   = C:\WINDDK\3790.1830\bin\win64\x86\r
+\r
+DEFINE ICC_BIN32  = C:\Program Files\Intel\Compiler\C++\9.1\IA32\Bin\r
+DEFINE ICC_BINX64 = C:\Program Files\Intel\Compiler\C++\9.1\EM64T\Bin\r
+DEFINE ICC_BIN64  = C:\Program Files\Intel\Compiler\C++\9.1\Itanium\Bin\r
+DEFINE EBC_BIN    = C:\Program Files\Intel\EBC\Bin\r
+\r
+DEFINE ELFGCC_BIN    = /usr/bin\r
+DEFINE PEGCC_BIN32   = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
+DEFINE PEGCC_BINX64  = /opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin\r
+DEFINE CYGWIN_BIN    = c:/cygwin/bin\r
+DEFINE CYGWIN_BIN32  = c:/cygwin/opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
+DEFINE CYGWIN_BINX64 = c:/cygwin/opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin\r
+\r
+DEFINE ASL_BIN = C:\ASL\r
+\r
 ####################################################################################\r
 #\r
 # format: TARGET_TOOLCHAIN_ARCH_COMMANDTYPE_ATTRIBUTE = <string>\r
@@ -67,39 +98,36 @@ IDENTIFIER = Default TOOL_CHAIN_CONF
 #\r
 ####################################################################################\r
 #   VS2003           - Microsoft Visual Studio .NET 2003\r
-*_VS2003_IA32_*_FAMILY              = MSFT\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_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_*_*_FAMILY                 = MSFT\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
+*_VS2003_IA32_*_DLL                 = DEF(VSNET2003_DLL)\r
+\r
+*_VS2003_IA32_CC_PATH               = DEF(VSNET2003_BIN)\cl.exe\r
+*_VS2003_IA32_VFRPP_PATH            = DEF(VSNET2003_BIN)\cl.exe\r
+*_VS2003_IA32_SLINK_PATH            = DEF(VSNET2003_BIN)\lib.exe\r
+*_VS2003_IA32_DLINK_PATH            = DEF(VSNET2003_BIN)\link.exe\r
+*_VS2003_IA32_ASMLINK_PATH          = DEF(VSNET2003_BIN)\link.exe\r
+*_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
 \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_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.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_CC_FLAGS               = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
+RELEASE_VS2003_IA32_CC_FLAGS             = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192\r
+DEBUG_VS2003_IA32_PCH_FLAGS              = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.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 /FIAutoGen.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
 #\r
 # Microsoft Device Driver Kit 3790.1830 (IA-32, X64, Itanium, with Link Time Code Generation)\r
@@ -108,38 +136,33 @@ RELEASE_VS2003_IA32_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /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
-*_WINDDK3790x1830_*_DLINK_NAME      = link.exe\r
-*_WINDDK3790x1830_*_ASMLINK_NAME    = link.exe\r
-*_WINDDK3790x1830_*_PP_NAME         = cl.exe\r
-*_WINDDK3790x1830_*_APP_NAME        = cl.exe\r
-*_WINDDK3790x1830_*_PCH_NAME        = cl.exe\r
-\r
+*_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
 \r
 ##################\r
-# IA32 definitions\r
+# ASL definitions\r
 ##################\r
-*_WINDDK3790x1830_IA32_ASM_NAME     = ml.exe\r
+*_WINDDK3790x1830_*_ASL_PATH        = DEF(ASL_BIN)\iasl.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
-RELEASE_WINDDK3790x1830_IA32_CC_FLAGS    = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
-DEBUG_WINDDK3790x1830_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_WINDDK3790x1830_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
+##################\r
+# IA32 definitions\r
+##################\r
+*_WINDDK3790x1830_IA32_CC_PATH         = DEF(WINDDK_BIN32)\cl.exe\r
+*_WINDDK3790x1830_IA32_SLINK_PATH      = DEF(WINDDK_BIN32)\lib.exe\r
+*_WINDDK3790x1830_IA32_DLINK_PATH      = DEF(WINDDK_BIN32)\link.exe\r
+*_WINDDK3790x1830_IA32_ASMLINK_PATH    = DEF(WINDDK_BIN16)\link.exe\r
+*_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
+\r
+DEBUG_WINDDK3790x1830_IA32_CC_FLAGS      = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
+RELEASE_WINDDK3790x1830_IA32_CC_FLAGS    = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192\r
+DEBUG_WINDDK3790x1830_IA32_PCH_FLAGS     = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
+RELEASE_WINDDK3790x1830_IA32_PCH_FLAGS   = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
 DEBUG_WINDDK3790x1830_IA32_ASM_FLAGS     = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
 RELEASE_WINDDK3790x1830_IA32_ASM_FLAGS   = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
 DEBUG_WINDDK3790x1830_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
@@ -149,13 +172,20 @@ RELEASE_WINDDK3790x1830_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ##################\r
 # x64 definitions\r
 ##################\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
+*_WINDDK3790x1830_IA32_CC_PATH         = DEF(WINDDK_BINX64)\cl.exe\r
+*_WINDDK3790x1830_IA32_SLINK_PATH      = DEF(WINDDK_BINX64)\lib.exe\r
+*_WINDDK3790x1830_IA32_DLINK_PATH      = DEF(WINDDK_BINX64)\link.exe\r
+*_WINDDK3790x1830_IA32_ASMLINK_PATH    = DEF(WINDDK_BIN16)\link.exe\r
+*_WINDDK3790x1830_IA32_PP_PATH         = DEF(WINDDK_BINX64)\cl.exe\r
+*_WINDDK3790x1830_IA32_VFRPP_PATH      = DEF(WINDDK_BINX64)\cl.exe\r
+*_WINDDK3790x1830_IA32_APP_PATH        = DEF(WINDDK_BINX64)\cl.exe\r
+*_WINDDK3790x1830_IA32_PCH_PATH        = DEF(WINDDK_BINX64)\cl.exe\r
+*_WINDDK3790x1830_IA32_ASM_PATH        = DEF(WINDDK_BINX64)\ml64.exe\r
+\r
+DEBUG_WINDDK3790x1830_X64_CC_FLAGS       = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /Zi /Gm /EHs-c- /GF\r
+RELEASE_WINDDK3790x1830_X64_CC_FLAGS     = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GF\r
+DEBUG_WINDDK3790x1830_X64_PCH_FLAGS      = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.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 /FIAutoGen.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
@@ -164,13 +194,20 @@ RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ##################\r
 # IPF definitions\r
 ##################\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
+*_WINDDK3790x1830_IA32_CC_PATH         = DEF(WINDDK_BIN64)\cl.exe\r
+*_WINDDK3790x1830_IA32_SLINK_PATH      = DEF(WINDDK_BIN64)\lib.exe\r
+*_WINDDK3790x1830_IA32_DLINK_PATH      = DEF(WINDDK_BIN64)\link.exe\r
+*_WINDDK3790x1830_IA32_ASMLINK_PATH    = DEF(WINDDK_BIN16)\link.exe\r
+*_WINDDK3790x1830_IA32_PP_PATH         = DEF(WINDDK_BIN64)\cl.exe\r
+*_WINDDK3790x1830_IA32_VFRPP_PATH      = DEF(WINDDK_BIN64)\cl.exe\r
+*_WINDDK3790x1830_IA32_APP_PATH        = DEF(WINDDK_BIN64)\cl.exe\r
+*_WINDDK3790x1830_IA32_PCH_PATH        = DEF(WINDDK_BIN64)\cl.exe\r
+*_WINDDK3790x1830_IPF_ASM_PATH         = DEF(WINDDK_BIN64)\ias.exe\r
+\r
+DEBUG_WINDDK3790x1830_IPF_CC_FLAGS       = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FIAutoGen.h /Zi\r
+RELEASE_WINDDK3790x1830_IPF_CC_FLAGS     = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FIAutoGen.h\r
+DEBUG_WINDDK3790x1830_IPF_PCH_FLAGS      = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FIAutoGen.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 /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:$(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
@@ -181,427 +218,91 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 ##################\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_PP_PATH       = DEF(EBC_BIN)\iec.exe\r
+*_WINDDK3790x1830_EBC_CC_PATH       = DEF(EBC_BIN)\iec.exe\r
+*_WINDDK3790x1830_EBC_DLINK_PATH    = DEF(EBC_BIN)\link.exe\r
+*_WINDDK3790x1830_EBC_SLINK_PATH    = DEF(EBC_BIN)\link.exe\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_CC_FLAGS           = /nologo /c /W3 /WX /FIAutoGen.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
-\r
-*_WINDDK3790x1830_*_ASL_NAME        = iasl.exe\r
-\r
-\r
 ####################################################################################\r
 #\r
-# Microsoft Visual Studio 2005 Express Edition (IA-32 Only, with no Link Time Code Generation)\r
-#\r
-# Uncomment this section to use these tools or install in an alternate location\r
-# if more than one version of VS2005 is installed on a single system.\r
+# Unix GCC\r
 #\r
 ####################################################################################\r
-#   VS2005EXP        - Microsoft Visual Studio 2005 Express Edition\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
-\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
-\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              = "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
-\r
-*_VS2005EXP_IA32_ASL_NAME           = iasl.exe\r
-\r
+#   UINIXGCC         - UINIX GCC\r
+*_UNIXGCC_*_*_FAMILY             = GCC\r
 \r
-####################################################################################\r
-#\r
-# Microsoft Visual Studio 2005 Standard Edition (IA-32 Only, with no Link Time Code Generation)\r
-#\r
-# Uncomment this section to use these tools or install in an alternate location\r
-# if more than one version of VS2005 is installed on a single system.\r
-#\r
-####################################################################################\r
-#   VS2005STD        - Microsoft Visual Studio 2005 Standard Edition\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
+*_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
 # IA32 definitions\r
 ##################\r
-#*_VS2005STD_IA32_ASM_NAME           = ml.exe\r
+*_UNIXGCC_IA32_CC_PATH              = DEF(PEGCC_BIN32)/gcc\r
+*_UNIXGCC_IA32_SLINK_PATH           = DEF(PEGCC_BIN32)/ar\r
+*_UNIXGCC_IA32_DLINK_PATH           = DEF(PEGCC_BIN32)/ld\r
+*_UNIXGCC_IA32_ASM_PATH             = DEF(PEGCC_BIN32)/gcc\r
+*_UNIXGCC_IA32_PP_PATH              = DEF(PEGCC_BIN32)/gcc\r
+*_UNIXGCC_IA32_VFRPP_PATH           = DEF(PEGCC_BIN32)/cc\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
+*_UNIXGCC_IA32_CC_FLAGS                  = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h\r
 \r
 ##################\r
-# EBC definitions\r
-##################\r
-*_VS2005STD_EBC_*_FAMILY            = INTEL\r
-\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
+# X64 definitions\r
 ##################\r
-*_VS2005STD_*_ASL_FAMILY            = INTEL\r
-\r
-*_VS2005STD_*_ASL_NAME              = iasl.exe\r
+*_UNIXGCC_X64_CC_PATH               = DEF(PEGCC_BINX64)/gcc\r
+*_UNIXGCC_X64_SLINK_PATH            = DEF(PEGCC_BINX64)/ar\r
+*_UNIXGCC_X64_DLINK_PATH            = DEF(PEGCC_BINX64)/ld\r
+*_UNIXGCC_X64_ASM_PATH              = DEF(PEGCC_BINX64)/gcc\r
+*_UNIXGCC_X64_PP_PATH               = DEF(PEGCC_BINX64)/gcc\r
+*_UNIXGCC_X64_VFRPP_PATH            = DEF(PEGCC_BINX64)/gcc\r
 \r
+*_UNIXGCC_X64_CC_FLAGS                   = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h -D_EFI_P64\r
 \r
 ####################################################################################\r
 #\r
-# Microsoft Visual Studio 2005 Professional Edition (IA-32 and X64 Only, with Link Time Code Generation)\r
+# Cygwin GCC\r
 #\r
 ####################################################################################\r
-#   VS2005PRO        - Microsoft Visual Studio 2005 Professional Edition\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
-\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
-\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
-\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              = "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
-\r
-*_VS2005PRO_*_ASL_NAME              = iasl.exe\r
+#   CYGWINGCC        - CygWin GCC\r
+*_CYGWINGCC_*_*_FAMILY           = GCC\r
 \r
+*_CYGWINGCC_*_*_DPATH               = DEF(CYGWIN_BIN)\r
+*_CYGWINGCC_*_ASL_PATH              = DEF(ASL_BIN)/iasl.exe\r
 \r
-####################################################################################\r
-#\r
-# Microsoft Visual Studio 2005 Team Suite Edition (IA-32, X64, and Itanium, with Link Time Code Generation)\r
-#\r
-# Uncomment this section to use these tools or install in an alternate location\r
-# if more than one version of VS2005 is installed on a single system.\r
-#\r
-####################################################################################\r
-#   VS2005TEAMSUITE  - Microsoft Visual Studio 2005 Team Suite Edition\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
+*_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 AutoGen.h\r
+*_CYGWINGCC_*_PP_FLAGS                   = -E -x assembler-with-cpp -include AutoGen.h\r
+*_CYGWINGCC_*_VFRPP_FLAGS                = -x c -E -P -DVFRCOMPILE --include AutoGen.h\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-#*_VS2005TEAMSUITE_IA32_ASM_NAME     = ml.exe\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
-#DEBUG_VS2005TEAMSUITE_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_VS2005TEAMSUITE_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_VS2005TEAMSUITE_IA32_ASM_FLAGS     = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
-#RELEASE_VS2005TEAMSUITE_IA32_ASM_FLAGS   = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
-#DEBUG_VS2005TEAMSUITE_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_VS2005TEAMSUITE_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
-#*_VS2005TEAMSUITE_IA32_ASMLINK_FLAGS     = /link /nologo /tiny\r
-\r
-##################\r
-# x64 definitions\r
-##################\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
-\r
-##################\r
-# IPF definitions\r
-##################\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
-\r
-##################\r
-# EBC definitions\r
-##################\r
-*_VS2005TEAMSUITE_EBC_*_FAMILY      = INTEL\r
+*_CYGWINGCC_IA32_CC_PATH            = DEF(CYGWIN_BIN32)/gcc\r
+*_CYGWINGCC_IA32_SLINK_PATH         = DEF(CYGWIN_BIN32)/ar\r
+*_CYGWINGCC_IA32_DLINK_PATH         = DEF(CYGWIN_BIN32)/ld\r
+*_CYGWINGCC_IA32_ASM_PATH           = DEF(CYGWIN_BIN32)/gcc\r
+*_CYGWINGCC_IA32_PP_PATH            = DEF(CYGWIN_BIN32)/gcc\r
+*_CYGWINGCC_IA32_VFRPP_PATH         = DEF(CYGWIN_BIN32)/gcc\r
 \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
+*_CYGWINGCC_IA32_CC_FLAGS                = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include AutoGen.h\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
-\r
-*_VS2005TEAMSUITE_*_ASL_NAME        = iasl.exe\r
-\r
-\r
-####################################################################################\r
-#\r
-# Unix GCC\r
-#\r
-####################################################################################\r
-#   UINIXGCC         - UINIX GCC\r
-*_UNIXGCC_IA32_*_FAMILY             = GCC\r
-\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_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
+# X64 definitions\r
 ##################\r
-*_UNIXGCC_X64_*_FAMILY              = GCC\r
-\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
-\r
-\r
-####################################################################################\r
-#\r
-# Cygwin GCC\r
-#\r
-####################################################################################\r
-#   CYGWINGCC        - CygWin GCC\r
-*_CYGWINGCC_IA32_*_FAMILY           = GCC\r
-\r
-*_CYGWINGCC_IA32_*_PATH             = c:/cygwin/opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
-*_CYGWINGCC_X64_*_PATH              = c:/cygwin/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_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
-\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
+*_CYGWINGCC_X64_CC_PATH             = DEF(CYGWIN_BINX64)/gcc\r
+*_CYGWINGCC_X64_SLINK_PATH          = DEF(CYGWIN_BINX64)/ar\r
+*_CYGWINGCC_X64_DLINK_PATH          = DEF(CYGWIN_BINX64)/ld\r
+*_CYGWINGCC_X64_ASM_PATH            = DEF(CYGWIN_BINX64)/gcc\r
+*_CYGWINGCC_X64_PP_PATH             = DEF(CYGWIN_BINX64)/gcc\r
+*_CYGWINGCC_X64_VFRPP_PATH          = DEF(CYGWIN_BINX64)/gcc\r
 \r
+*_CYGWINGCC_X64_CC_FLAGS                 = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include AutoGen.h -D_EFI_P64\r
 \r
 ####################################################################################\r
 #\r
@@ -611,14 +312,13 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ####################################################################################\r
 #   ELFGCC           - Linux ELF 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_PATH               = DEF(ELFGCC_BIN)/gcc\r
+*_ELFGCC_IA32_SLINK_PATH            = DEF(ELFGCC_BIN)/ar\r
+*_ELFGCC_IA32_DLINK_PATH            = DEF(ELFGCC_BIN)/ld\r
+*_ELFGCC_IA32_ASM_PATH              = DEF(ELFGCC_BIN)/gcc\r
+*_ELFGCC_IA32_PP_PATH               = DEF(ELFGCC_BIN)/gcc\r
+*_ELFGCC_IA32_VFRPP_PATH            = DEF(ELFGCC_BIN)/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
@@ -634,11 +334,9 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ####################################################################################\r
 # *_*_EBC_*_FAMILY                   = INTEL\r
 #\r
-# *_*_EBC_*_PATH                     = C:\Program Files\Intel\EBC\Bin\r
-#\r
-# *_*_EBC_PP_NAME                    = iec.exe\r
-# *_*_EBC_CC_NAME                    = iec.exe\r
-# *_*_EBC_SLINK_NAME                 = link.exe\r
+# *_*_EBC_PP_PATH                    = D:\Intel\EBC\Bin\iec.exe\r
+# *_*_EBC_CC_PATH                    = D:\Intel\EBC\Bin\iec.exe\r
+# *_*_EBC_SLINK_PATH                 = D:\Intel\EBC\Bin\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
@@ -652,9 +350,7 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ####################################################################################\r
 # *_*_*_ASL_FAMILY                   = INTEL\r
 #\r
-# *_*_*_ASL_PATH                     = C:\ASL\r
-#\r
-# *_*_*_ASL_NAME                     = iasl.exe\r
+# *_*_*_ASL_PATH                     = C:\ASL\iasl.exe\r
 #\r
 ####################################################################################\r
 #\r
@@ -663,9 +359,7 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ####################################################################################\r
 # *_*_*_ASL_FAMILY                   = MSFT\r
 #\r
-# *_*_*_ASL_PATH                     = C:\ASL\r
-#\r
-# *_*_*_ASL_NAME                     = asl.exe\r
+# *_*_*_ASL_PATH                     = C:\ASL\iasl.exe\r
 #\r
 \r
 \r
@@ -680,35 +374,28 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 #   ICC              - Intel C Compiler V9.1\r
 *_ICC_*_*_FAMILY                    = INTEL\r
 \r
-*_ICC_IA32_*_PATH                   = C:\Program Files\Intel\Compiler\C++\9.1\IA32\Bin\r
-*_ICC_X64_*_PATH                   = C:\Program Files\Intel\Compiler\C++\9.1\EM64T\Bin\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
+*_ICC_*_ASL_PATH                    = DEF(ASL_BIN)\iasl.exe\r
 \r
 *_ICC_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+*_ICC_*_APP_FLAGS                        = /nologo /E /TC\r
+*_ICC_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_ICC_IA32_ASM_FAMILY                  = MSFT\r
-*_ICC_IA32_ASM_PATH                    = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
-*_ICC_IA32_PCH_NAME                    = icl.exe\r
-\r
-*_ICC_IA32_CC_NAME                     = icl.exe\r
-*_ICC_IA32_SLINK_NAME                  = xilib.exe\r
-*_ICC_IA32_DLINK_NAME                  = xilink.exe\r
-*_ICC_IA32_ASMLINK_NAME                = xilink.exe\r
-*_ICC_IA32_PP_NAME                     = icl.exe\r
-*_ICC_IA32_VFRPP_NAME                  = icl.exe\r
-*_ICC_IA32_APP_NAME                    = icl.exe\r
-*_ICC_IA32_ASM_NAME                    = ml.exe\r
-\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
+*_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
+*_ICC_IA32_DLINK_PATH                  = DEF(ICC_BIN32)\xilink.exe\r
+*_ICC_IA32_ASMLINK_PATH                = DEF(ICC_BIN32)\xilink.exe\r
+*_ICC_IA32_PP_PATH                     = DEF(ICC_BIN32)\icl.exe\r
+*_ICC_IA32_VFRPP_PATH                  = DEF(ICC_BIN32)\icl.exe\r
+*_ICC_IA32_APP_PATH                    = DEF(ICC_BIN32)\icl.exe\r
+*_ICC_IA32_ASM_PATH                    = DEF(VSNET2003_BIN)\ml.exe\r
+*_ICC_IA32_ASM_DLL                     = DEF(VSNET2003_DLL)\r
+\r
+DEBUG_ICC_IA32_CC_FLAGS                  = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.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\" /FIAutoGen.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 /Zd /W0 /Zi\r
@@ -720,23 +407,17 @@ RELEASE_ICC_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ##################\r
 # X64 definitions\r
 ##################\r
-*_ICC_X64_ASM_FAMILY                  = MSFT\r
-*_ICC_X64_ASM_PATH                    = C:\WINDDK\3790.1830\bin\win64\x86\amd64\r
-*_ICC_X64_PCH_NAME                    = icl.exe\r
-\r
-*_ICC_X64_CC_NAME                     = icl.exe\r
-*_ICC_X64_SLINK_NAME                  = xilib.exe\r
-*_ICC_X64_DLINK_NAME                  = xilink.exe\r
-*_ICC_X64_ASMLINK_NAME                = xilink.exe\r
-*_ICC_X64_PP_NAME                     = icl.exe\r
-*_ICC_X64_VFRPP_NAME                  = icl.exe\r
-*_ICC_X64_APP_NAME                    = icl.exe\r
-*_ICC_X64_ASM_NAME                    = ml64.exe\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
+*_ICC_X64_DLINK_PATH                  = DEF(ICC_BINX64)\xilink.exe\r
+*_ICC_X64_ASMLINK_PATH                = DEF(ICC_BINX64)\xilink.exe\r
+*_ICC_X64_PP_PATH                     = DEF(ICC_BINX64)\icl.exe\r
+*_ICC_X64_VFRPP_PATH                  = DEF(ICC_BINX64)\icl.exe\r
+*_ICC_X64_APP_PATH                    = DEF(ICC_BINX64)\icl.exe\r
+*_ICC_X64_ASM_PATH                    = DEF(WINDDK_BINX64)\ml64.exe\r
+*_ICC_X64_ASM_DLL                     = DEF(VSNET2003_DLL)\r
 \r
-*_ICC_X64_SLINK_FLAGS                = /nologo /LTCG\r
-*_ICC_X64_APP_FLAGS                  = /nologo /E /TC\r
-*_ICC_X64_PP_FLAGS                   = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
 DEBUG_ICC_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_ICC_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_ICC_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
@@ -745,43 +426,33 @@ DEBUG_ICC_X64_ASM_FLAGS              = /nologo /W3 /WX /c /Cx /Zd /Zi
 RELEASE_ICC_X64_ASM_FLAGS            = /nologo /W3 /WX /c /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:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
 RELEASE_ICC_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
+*_ICC_X64_SLINK_FLAGS                = /nologo /LTCG\r
 \r
 \r
 ##################\r
 # IPF definitions\r
 ##################\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
+*_ICC_IPF_CC_PATH                   = DEF(WINDDK_BIN64)\icl.exe\r
+*_ICC_IPF_SLINK_PATH                = DEF(WINDDK_BIN64)\xilib.exe\r
+*_ICC_IPF_DLINK_PATH                = DEF(WINDDK_BIN64)\xilink.exe\r
+*_ICC_IPF_ASMLINK_PATH              = DEF(WINDDK_BIN64)\xilink.exe\r
+*_ICC_IPF_PP_PATH                   = DEF(WINDDK_BIN64)\icl.exe\r
+*_ICC_IPF_VFRPP_PATH                = DEF(WINDDK_BIN64)\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
+*_ICC_IPF_PCH_PATH                  = DEF(WINDDK_BIN64)\icl.exe\r
+*_ICC_IPF_APP_PATH                  = DEF(WINDDK_BIN64)\icl.exe\r
+*_ICC_IPF_ASM_PATH                  = DEF(WINDDK_BIN64)\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_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\r
 \r
-##################\r
-# ASL definitions\r
-##################\r
-*_ICC_*_ASL_FAMILY                  = INTEL\r
-\r
-*_ICC_*_ASL_NAME                    = iasl.exe\r
-\r
 ####################################################################################\r
 #\r
 # MYTOOLS\r
@@ -789,42 +460,32 @@ RELEASE_ICC_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 #   X64  - Microsoft Windows DDK 3790.1830\r
 #   IPF  - Microsoft Windows DDK 3790.1830\r
 #   EBC  - Intel EFI Byte Code Compiler\r
-#   ASL  - Intel ACPI Source Language COmpiler\r
 #\r
 ####################################################################################\r
 #   MYTOOLS          - Settings compatible with previous versions of tools_def.template\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
+*_MYTOOLS_*_TIANO_PATH              = TianoCompress.exe\r
+*_MYTOOLS_*_TIANO_GUID                   = A31280AD-481E-41B6-95E8-127F4C984779\r
 \r
-*_MYTOOLS_*_VFRPP_FLAGS                  = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+*_MYTOOLS_*_ASL_PATH                = DEF(ASL_BIN)\iasl.exe\r
 \r
-*_MYTOOLS_*_TIANO_NAME              = TianoCompress.exe\r
-*_MYTOOLS_*_TIANO_GUID                   = A31280AD-481E-41B6-95E8-127F4C984779\r
+*_MYTOOLS_*_VFRPP_FLAGS                  = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_MYTOOLS_IA32_PCH_NAME             = cl.exe\r
+*_MYTOOLS_IA32_*_DLL                = DEF(VSNET2003_DLL)\r
+\r
+*_MYTOOLS_IA32_CC_PATH              = DEF(VSNET2003_BIN)\cl.exe\r
+*_MYTOOLS_IA32_SLINK_PATH           = DEF(VSNET2003_BIN)\lib.exe\r
+*_MYTOOLS_IA32_DLINK_PATH           = DEF(VSNET2003_BIN)\link.exe\r
+*_MYTOOLS_IA32_ASMLINK_PATH         = DEF(WINDDK_BIN16)\link.exe\r
+*_MYTOOLS_IA32_PP_PATH              = DEF(VSNET2003_BIN)\cl.exe\r
+*_MYTOOLS_IA32_VFRPP_PATH           = DEF(VSNET2003_BIN)\cl.exe\r
+*_MYTOOLS_IA32_APP_PATH             = DEF(VSNET2003_BIN)\cl.exe\r
+*_MYTOOLS_IA32_ASM_PATH             = DEF(VSNET2003_BIN)\ml.exe\r
+*_MYTOOLS_IA32_PCH_PATH             = DEF(VSNET2003_BIN)\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
@@ -842,8 +503,15 @@ RELEASE_MYTOOLS_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ##################\r
 # x64 definitions\r
 ##################\r
-*_MYTOOLS_X64_PCH_NAME              = cl.exe\r
-*_MYTOOLS_X64_ASM_NAME              = ml64.exe\r
+*_MYTOOLS_X64_CC_PATH              = DEF(WINDDK_BINX64)\cl.exe\r
+*_MYTOOLS_X64_SLINK_PATH           = DEF(WINDDK_BINX64)\lib.exe\r
+*_MYTOOLS_X64_DLINK_PATH           = DEF(WINDDK_BINX64)\link.exe\r
+*_MYTOOLS_X64_ASMLINK_PATH         = DEF(WINDDK_BIN16)\link.exe\r
+*_MYTOOLS_X64_PP_PATH              = DEF(WINDDK_BINX64)\cl.exe\r
+*_MYTOOLS_X64_VFRPP_PATH           = DEF(WINDDK_BINX64)\cl.exe\r
+*_MYTOOLS_X64_APP_PATH             = DEF(WINDDK_BINX64)\cl.exe\r
+*_MYTOOLS_X64_ASM_PATH             = DEF(WINDDK_BINX64)\ml64.exe\r
+*_MYTOOLS_X64_PCH_PATH             = DEF(WINDDK_BINX64)\cl.exe\r
 \r
 *_MYTOOLS_X64_SLINK_FLAGS                = /nologo /LTCG\r
 *_MYTOOLS_X64_APP_FLAGS                  = /nologo /E /TC\r
@@ -860,8 +528,15 @@ RELEASE_MYTOOLS_X64_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ##################\r
 # IPF definitions\r
 ##################\r
-*_MYTOOLS_IPF_PCH_NAME              = cl.exe\r
-*_MYTOOLS_IPF_ASM_NAME              = ias.exe\r
+*_MYTOOLS_IPF_CC_PATH              = DEF(WINDDK_BIN64)\cl.exe\r
+*_MYTOOLS_IPF_SLINK_PATH           = DEF(WINDDK_BIN64)\lib.exe\r
+*_MYTOOLS_IPF_DLINK_PATH           = DEF(WINDDK_BIN64)\link.exe\r
+*_MYTOOLS_IPF_ASMLINK_PATH         = DEF(WINDDK_BIN16)\link.exe\r
+*_MYTOOLS_IPF_PP_PATH              = DEF(WINDDK_BIN64)\cl.exe\r
+*_MYTOOLS_IPF_VFRPP_PATH           = DEF(WINDDK_BIN64)\cl.exe\r
+*_MYTOOLS_IPF_APP_PATH             = DEF(WINDDK_BIN64)\cl.exe\r
+*_MYTOOLS_IPF_ASM_PATH             = DEF(WINDDK_BIN64)\ias.exe\r
+*_MYTOOLS_IPF_PCH_PATH             = DEF(WINDDK_BIN64)\cl.exe\r
 \r
 *_MYTOOLS_IPF_ASM_OUTPUT                 = "-o "\r
 \r
@@ -880,21 +555,15 @@ RELEASE_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 ##################\r
 # EBC definitions\r
 ##################\r
-*_MYTOOLS_EBC_*_FAMILY              = INTEL\r
+*_MYTOOLS_EBC_*_FAMILY             = INTEL\r
 \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_PP_PATH              = DEF(EBC_BIN)\iec.exe\r
+*_MYTOOLS_EBC_CC_PATH              = DEF(EBC_BIN)\iec.exe\r
+*_MYTOOLS_EBC_SLINK_PATH           = DEF(EBC_BIN)\link.exe\r
+*_MYTOOLS_EBC_DLINK_PATH           = DEF(EBC_BIN)\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_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h\r
+*_MYTOOLS_EBC_CC_FLAGS                   = /nologo /c /W3 /WX /FIAutoGen.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
-\r
-*_MYTOOLS_*_ASL_NAME                = iasl.exe\r

diff --git a/BaseTools/ReadMe.txt b/BaseTools/ReadMe.txt
index 0880b08cc6f0ad1b4f13e81ca7acd7817b55ced6..f461f05be10a5c23c7669cfbd770676cf0a62706 100644 (file)
--- a/BaseTools/ReadMe.txt
+++ b/BaseTools/ReadMe.txt
@@ -28,16 +28,16 @@ Notes:
         cannot generate AutoGen.* files. Only "build" command can.\r
 3) build.exe in %WORKSPACE%\BaseTools\Bin\Win32 is generated from following revision of\r
    Python source code:\r
-        r658 <buildtools_project>\BaseTools\Source\Python\Autogen\r
-        r725 <buildtools_project>\BaseTools\Source\Python\build\r
-        r700 <buildtools_project>\BaseTools\Source\Python\Common\r
-        r695 <buildtools_project>\BaseTools\Source\Python\CommonDataClass\r
-        r710 <buildtools_project>\BaseTools\Source\Python\GenFds\r
+        r729 <buildtools_project>\BaseTools\Source\Python\Autogen\r
+        r729 <buildtools_project>\BaseTools\Source\Python\build\r
+        r729 <buildtools_project>\BaseTools\Source\Python\Common\r
+        r729 <buildtools_project>\BaseTools\Source\Python\CommonDataClass\r
+        r729 <buildtools_project>\BaseTools\Source\Python\GenFds\r
         \r
 4) GenFds.exe has is a combo of the follow python source.(This is a temporary branch)\r
-        r700 <buildtools_project>\BaseTools\Source\Python\Common\r
-        r695 <buildtools_project>\BaseTools\Source\Python\CommonDataClass\r
-        r710 <buildtools_project>\BaseTools\Source\Python\GenFds\r
+        r729 <buildtools_project>\BaseTools\Source\Python\Common\r
+        r729 <buildtools_project>\BaseTools\Source\Python\CommonDataClass\r
+        r729 <buildtools_project>\BaseTools\Source\Python\GenFds\r
        \r
 Brief usage for Migration Tool MigrationMsa2Inf.exe:\r
 1. Command line format:\r