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

5 files changed, 244 insertions, 575 deletions

diff --git a/BaseTools/Bin/Win32/GenFds.exe b/BaseTools/Bin/Win32/GenFds.exe
index c8121ba313..983e59a4e0 100755
--- a/BaseTools/Bin/Win32/GenFds.exe
+++ b/BaseTools/Bin/Win32/GenFds.exe
diff --git a/BaseTools/Bin/Win32/Trim.exe b/BaseTools/Bin/Win32/Trim.exe
index 10a675af05..a092e404e9 100755
--- a/BaseTools/Bin/Win32/Trim.exe
+++ b/BaseTools/Bin/Win32/Trim.exe
diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index f6068ae5a5..ac13631ca0 100755
--- a/BaseTools/Bin/Win32/build.exe
+++ b/BaseTools/Bin/Win32/build.exe
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 80262f9791..d4cfae6600 100644
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -12,6 +12,37 @@
 

 IDENTIFIER = Default TOOL_CHAIN_CONF

 

+# common path macros

+DEFINE VSNET_BIN = C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin

+DEFINE VSNET_DLL = C:\Program Files\Microsoft Visual Studio .NET\Common7\IDE

+

+DEFINE VSNET2003_BIN = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin

+DEFINE VSNET2003_DLL = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE

+

+DEFINE VS2005EXP_BIN = C:\Program Files\Microsoft Visual Studio 8\Vc\bin

+DEFINE VS2005STD_BIN = C:\Program Files\Microsoft Visual Studio 8\Vc\bin

+DEFINE VS2005PRO_BIN = C:\Program Files\Microsoft Visual Studio 8\Vc\bin

+DEFINE VS2005TS_BIN  = C:\Program Files\Microsoft Visual Studio 8\Vc\bin

+

+DEFINE WINDDK_BIN16   = C:\WINDDK\3790.1830\bin\bin16

+DEFINE WINDDK_BIN32   = C:\WINDDK\3790.1830\bin\x86

+DEFINE WINDDK_BINX64  = C:\WINDDK\3790.1830\bin\win64\x86\amd64

+DEFINE WINDDK_BIN64   = C:\WINDDK\3790.1830\bin\win64\x86

+

+DEFINE ICC_BIN32  = C:\Program Files\Intel\Compiler\C++\9.1\IA32\Bin

+DEFINE ICC_BINX64 = C:\Program Files\Intel\Compiler\C++\9.1\EM64T\Bin

+DEFINE ICC_BIN64  = C:\Program Files\Intel\Compiler\C++\9.1\Itanium\Bin

+DEFINE EBC_BIN    = C:\Program Files\Intel\EBC\Bin

+

+DEFINE ELFGCC_BIN    = /usr/bin

+DEFINE PEGCC_BIN32   = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin

+DEFINE PEGCC_BINX64  = /opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin

+DEFINE CYGWIN_BIN    = c:/cygwin/bin

+DEFINE CYGWIN_BIN32  = c:/cygwin/opt/tiano/i386-tiano-pe/i386-tiano-pe/bin

+DEFINE CYGWIN_BINX64 = c:/cygwin/opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin

+

+DEFINE ASL_BIN = C:\ASL

+

 ####################################################################################

 #

 # format: TARGET_TOOLCHAIN_ARCH_COMMANDTYPE_ATTRIBUTE = <string>

@@ -67,39 +98,36 @@ IDENTIFIER = Default TOOL_CHAIN_CONF
 #

 ####################################################################################

 #   VS2003           - Microsoft Visual Studio .NET 2003

-*_VS2003_IA32_*_FAMILY              = MSFT

-

-*_VS2003_IA32_*_PATH                = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin

-*_VS2003_IA32_*_DPATH               = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE

-

-*_VS2003_IA32_CC_NAME               = cl.exe

-*_VS2003_IA32_VFRPP_NAME            = cl.exe

-*_VS2003_IA32_SLINK_NAME            = lib.exe

-*_VS2003_IA32_DLINK_NAME            = link.exe

-*_VS2003_IA32_ASMLINK_NAME          = link.exe

-*_VS2003_IA32_APP_NAME              = cl.exe

-*_VS2003_IA32_PP_NAME               = cl.exe

-*_VS2003_IA32_ASM_NAME              = ml.exe

-*_VS2003_IA32_PCH_NAME              = cl.exe

+*_VS2003_*_*_FAMILY                 = MSFT

 

 ##################

 # IA32 definitions

 ##################

+*_VS2003_IA32_*_DLL                 = DEF(VSNET2003_DLL)

+

+*_VS2003_IA32_CC_PATH               = DEF(VSNET2003_BIN)\cl.exe

+*_VS2003_IA32_VFRPP_PATH            = DEF(VSNET2003_BIN)\cl.exe

+*_VS2003_IA32_SLINK_PATH            = DEF(VSNET2003_BIN)\lib.exe

+*_VS2003_IA32_DLINK_PATH            = DEF(VSNET2003_BIN)\link.exe

+*_VS2003_IA32_ASMLINK_PATH          = DEF(VSNET2003_BIN)\link.exe

+*_VS2003_IA32_APP_PATH              = DEF(VSNET2003_BIN)\cl.exe

+*_VS2003_IA32_PP_PATH               = DEF(VSNET2003_BIN)\cl.exe

+*_VS2003_IA32_ASM_PATH              = DEF(VSNET2003_BIN)\ml.exe

+*_VS2003_IA32_PCH_PATH              = DEF(VSNET2003_BIN)\cl.exe

 

 *_VS2003_IA32_APP_FLAGS                  = /nologo /E /TC

-*_VS2003_IA32_PP_FLAGS                   = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

+*_VS2003_IA32_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h

 *_VS2003_IA32_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h

-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

-RELEASE_VS2003_IA32_CC_FLAGS             = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192

-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

-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

+DEBUG_VS2003_IA32_CC_FLAGS               = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm

+RELEASE_VS2003_IA32_CC_FLAGS             = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192

+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

+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

 DEBUG_VS2003_IA32_ASM_FLAGS              = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi

 RELEASE_VS2003_IA32_ASM_FLAGS            = /nologo /W3 /WX /c /coff /Cx /Zd /W0

 *_VS2003_IA32_SLINK_FLAGS                = /nologo /LTCG

 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

 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

 

-

 ####################################################################################

 #

 # Microsoft Device Driver Kit 3790.1830 (IA-32, X64, Itanium, with Link Time Code Generation)

@@ -108,38 +136,33 @@ RELEASE_VS2003_IA32_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 #   WINDDK3790x1830  - Microsoft Windows DDK 3790.1830

 *_WINDDK3790x1830_*_*_FAMILY        = MSFT

 

-*_WINDDK3790x1830_IA32_*_PATH       = C:\WINDDK\3790.1830\bin\x86

-*_WINDDK3790x1830_IA32_*_DPATH      = C:\WINDDK\3790.1830\bin\x86

-*_WINDDK3790x1830_IA32_ASMLINK_PATH = C:\WINDDK\3790.1830\bin\bin16

-*_WINDDK3790x1830_X64_*_PATH        = C:\WINDDK\3790.1830\bin\win64\x86\amd64

-*_WINDDK3790x1830_X64_ASMLINK_PATH  = C:\WINDDK\3790.1830\bin\bin16

-*_WINDDK3790x1830_IPF_*_PATH        = C:\WINDDK\3790.1830\bin\win64\x86

-*_WINDDK3790x1830_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin

-*_WINDDK3790x1830_*_ASL_PATH        = C:\ASL

-

-*_WINDDK3790x1830_*_CC_NAME         = cl.exe

-*_WINDDK3790x1830_*_VFRPP_NAME      = cl.exe

-*_WINDDK3790x1830_*_SLINK_NAME      = lib.exe

-*_WINDDK3790x1830_*_DLINK_NAME      = link.exe

-*_WINDDK3790x1830_*_ASMLINK_NAME    = link.exe

-*_WINDDK3790x1830_*_PP_NAME         = cl.exe

-*_WINDDK3790x1830_*_APP_NAME        = cl.exe

-*_WINDDK3790x1830_*_PCH_NAME        = cl.exe

-

+*_WINDDK3790x1830_*_PP_FLAGS             = /nologo /E /TC /FIAutoGen.h

 *_WINDDK3790x1830_*_APP_FLAGS            = /nologo /E /TC

 *_WINDDK3790x1830_*_SLINK_FLAGS          = /nologo /LTCG

 *_WINDDK3790x1830_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h

 

 ##################

-# IA32 definitions

+# ASL definitions

 ##################

-*_WINDDK3790x1830_IA32_ASM_NAME     = ml.exe

+*_WINDDK3790x1830_*_ASL_PATH        = DEF(ASL_BIN)\iasl.exe

 

-*_WINDDK3790x1830_IA32_PP_FLAGS          = /nologo /E /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

-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

-RELEASE_WINDDK3790x1830_IA32_CC_FLAGS    = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192

-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

-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

+##################

+# IA32 definitions

+##################

+*_WINDDK3790x1830_IA32_CC_PATH         = DEF(WINDDK_BIN32)\cl.exe

+*_WINDDK3790x1830_IA32_SLINK_PATH      = DEF(WINDDK_BIN32)\lib.exe

+*_WINDDK3790x1830_IA32_DLINK_PATH      = DEF(WINDDK_BIN32)\link.exe

+*_WINDDK3790x1830_IA32_ASMLINK_PATH    = DEF(WINDDK_BIN16)\link.exe

+*_WINDDK3790x1830_IA32_PP_PATH         = DEF(WINDDK_BIN32)\cl.exe

+*_WINDDK3790x1830_IA32_VFRPP_PATH      = DEF(WINDDK_BIN32)\cl.exe

+*_WINDDK3790x1830_IA32_APP_PATH        = DEF(WINDDK_BIN32)\cl.exe

+*_WINDDK3790x1830_IA32_PCH_PATH        = DEF(WINDDK_BIN32)\cl.exe

+*_WINDDK3790x1830_IA32_ASM_PATH        = DEF(WINDDK_BIN32)\ml.exe

+

+DEBUG_WINDDK3790x1830_IA32_CC_FLAGS      = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm

+RELEASE_WINDDK3790x1830_IA32_CC_FLAGS    = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192

+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

+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

 DEBUG_WINDDK3790x1830_IA32_ASM_FLAGS     = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi

 RELEASE_WINDDK3790x1830_IA32_ASM_FLAGS   = /nologo /W3 /WX /c /coff /Cx /Zd /W0

 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

@@ -149,13 +172,20 @@ RELEASE_WINDDK3790x1830_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ##################

 # x64 definitions

 ##################

-*_WINDDK3790x1830_X64_ASM_NAME      = ml64.exe

-

-*_WINDDK3790x1830_X64_PP_FLAGS           = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

-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

-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

-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

-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

+*_WINDDK3790x1830_IA32_CC_PATH         = DEF(WINDDK_BINX64)\cl.exe

+*_WINDDK3790x1830_IA32_SLINK_PATH      = DEF(WINDDK_BINX64)\lib.exe

+*_WINDDK3790x1830_IA32_DLINK_PATH      = DEF(WINDDK_BINX64)\link.exe

+*_WINDDK3790x1830_IA32_ASMLINK_PATH    = DEF(WINDDK_BIN16)\link.exe

+*_WINDDK3790x1830_IA32_PP_PATH         = DEF(WINDDK_BINX64)\cl.exe

+*_WINDDK3790x1830_IA32_VFRPP_PATH      = DEF(WINDDK_BINX64)\cl.exe

+*_WINDDK3790x1830_IA32_APP_PATH        = DEF(WINDDK_BINX64)\cl.exe

+*_WINDDK3790x1830_IA32_PCH_PATH        = DEF(WINDDK_BINX64)\cl.exe

+*_WINDDK3790x1830_IA32_ASM_PATH        = DEF(WINDDK_BINX64)\ml64.exe

+

+DEBUG_WINDDK3790x1830_X64_CC_FLAGS       = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /Zi /Gm /EHs-c- /GF

+RELEASE_WINDDK3790x1830_X64_CC_FLAGS     = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GF

+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

+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

 DEBUG_WINDDK3790x1830_X64_ASM_FLAGS      = /nologo /W3 /WX /c /Cx /Zd /Zi

 RELEASE_WINDDK3790x1830_X64_ASM_FLAGS    = /nologo /W3 /WX /c /Cx /Zd

 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

@@ -164,13 +194,20 @@ RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ##################

 # IPF definitions

 ##################

-*_WINDDK3790x1830_IPF_ASM_NAME      = ias.exe

-

-*_WINDDK3790x1830_IPF_PP_FLAGS           = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

-DEBUG_WINDDK3790x1830_IPF_CC_FLAGS       = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi

-RELEASE_WINDDK3790x1830_IPF_CC_FLAGS     = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h

-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

-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

+*_WINDDK3790x1830_IA32_CC_PATH         = DEF(WINDDK_BIN64)\cl.exe

+*_WINDDK3790x1830_IA32_SLINK_PATH      = DEF(WINDDK_BIN64)\lib.exe

+*_WINDDK3790x1830_IA32_DLINK_PATH      = DEF(WINDDK_BIN64)\link.exe

+*_WINDDK3790x1830_IA32_ASMLINK_PATH    = DEF(WINDDK_BIN16)\link.exe

+*_WINDDK3790x1830_IA32_PP_PATH         = DEF(WINDDK_BIN64)\cl.exe

+*_WINDDK3790x1830_IA32_VFRPP_PATH      = DEF(WINDDK_BIN64)\cl.exe

+*_WINDDK3790x1830_IA32_APP_PATH        = DEF(WINDDK_BIN64)\cl.exe

+*_WINDDK3790x1830_IA32_PCH_PATH        = DEF(WINDDK_BIN64)\cl.exe

+*_WINDDK3790x1830_IPF_ASM_PATH         = DEF(WINDDK_BIN64)\ias.exe

+

+DEBUG_WINDDK3790x1830_IPF_CC_FLAGS       = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FIAutoGen.h /Zi

+RELEASE_WINDDK3790x1830_IPF_CC_FLAGS     = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FIAutoGen.h

+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

+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

 DEBUG_WINDDK3790x1830_IPF_ASM_FLAGS      = -N us -X explicit -M ilp64 -N so -W4 -d debug

 RELEASE_WINDDK3790x1830_IPF_ASM_FLAGS    = -N us -X explicit -M ilp64 -N so -W4

 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

@@ -181,427 +218,91 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 ##################

 *_WINDDK3790x1830_EBC_*_FAMILY      = INTEL

 

-*_WINDDK3790x1830_EBC_PP_NAME       = iec.exe

-*_WINDDK3790x1830_EBC_CC_NAME       = iec.exe

-*_WINDDK3790x1830_EBC_DLINK_NAME    = link.exe

-*_WINDDK3790x1830_EBC_SLINK_NAME    = link.exe

+*_WINDDK3790x1830_EBC_PP_PATH       = DEF(EBC_BIN)\iec.exe

+*_WINDDK3790x1830_EBC_CC_PATH       = DEF(EBC_BIN)\iec.exe

+*_WINDDK3790x1830_EBC_DLINK_PATH    = DEF(EBC_BIN)\link.exe

+*_WINDDK3790x1830_EBC_SLINK_PATH    = DEF(EBC_BIN)\link.exe

 

-*_WINDDK3790x1830_EBC_PP_FLAGS           = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

-*_WINDDK3790x1830_EBC_CC_FLAGS           = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h

+*_WINDDK3790x1830_EBC_CC_FLAGS           = /nologo /c /W3 /WX /FIAutoGen.h

 *_WINDDK3790x1830_EBC_SLINK_FLAGS        = /lib /NOLOGO /MACHINE:EBC

 *_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

 

-##################

-# ASL definitions

-##################

-*_WINDDK3790x1830_*_ASL_FAMILY      = INTEL

-

-*_WINDDK3790x1830_*_ASL_NAME        = iasl.exe

-

-

 ####################################################################################

 #

-# Microsoft Visual Studio 2005 Express Edition (IA-32 Only, with no Link Time Code Generation)

-#

-# Uncomment this section to use these tools or install in an alternate location

-# if more than one version of VS2005 is installed on a single system.

+# Unix GCC

 #

 ####################################################################################

-#   VS2005EXP        - Microsoft Visual Studio 2005 Express Edition

-#*_VS2005EXP_IA32_*_FAMILY           = MSFT

-#

-#*_VS2005EXP_IA32_*_PATH             = C:\Program Files\Microsoft Visual Studio 8\Vc\bin

-#*_VS2005EXP_IA32_*_DPATH            = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE

-#*_VS2005EXP_IA32_ASM_PATH           = C:\WINDDK\3790.1830\bin\x86

-#*_VS2005EXP_IA32_ASMLINK_PATH       = C:\WINDDK\3790.1830\bin\bin16

-*_VS2005EXP_EBC_*_PATH              = C:\Program Files\Intel\EBC\Bin

-*_VS2005EXP_IA32_ASL_PATH           = C:\ASL

-

-#*_VS2005EXP_IA32_CC_NAME            = cl.exe

-#*_VS2005EXP_IA32_SLINK_NAME         = lib.exe

-#*_VS2005EXP_IA32_DLINK_NAME         = link.exe

-#*_VS2005EXP_IA32_ASMLINK_NAME       = link.exe

-#*_VS2005EXP_IA32_PP_NAME            = cl.exe

-#*_VS2005EXP_IA32_APP_NAME           = cl.exe

-#*_VS2005EXP_IA32_VFRPP_NAME         = cl.exe

-#*_VS2005EXP_IA32_PCH_NAME           = cl.exe

-

-#*_VS2005EXP_IA32_SLINK_FLAGS             = /NOLOGO /LTCG

-#*_VS2005EXP_IA32_APP_FLAGS               = /nologo /E /TC

-#*_VS2005EXP_IA32_PP_FLAGS                = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

-#*_VS2005EXP_IA32_VFRPP_FLAGS             = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h

-

-##################

-# IA32 definitions

-##################

-#*_VS2005EXP_IA32_ASM_NAME           = ml.exe

-

-#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

-#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

-#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

-#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

-#DEBUG_VS2005EXP_IA32_ASM_FLAGS           = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi

-#RELEASE_VS2005EXP_IA32_ASM_FLAGS         = /nologo /W3 /WX /c /coff /Cx /Zd /W0

-#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

-#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

-#*_VS2005EXP_IA32_ASMLINK_FLAGS           = /link /nologo /tiny

-

-##################

-# EBC definitions

-##################

-*_VS2005EXP_EBC_*_FAMILY            = INTEL

-

-*_VS2005EXP_EBC_PP_NAME             = iec.exe

-*_VS2005EXP_EBC_CC_NAME             = iec.exe

-*_VS2005EXP_EBC_DLINK_NAME          = link.exe

-*_VS2005EXP_EBC_SLINK_NAME          = link.exe

-

-*_VS2005EXP_EBC_PP_FLAGS                 = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

-*_VS2005EXP_EBC_CC_FLAGS                 = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h

-*_VS2005EXP_EBC_SLINK_FLAGS              = /lib /NOLOGO /MACHINE:EBC

-*_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

-

-##################

-# ASL definitions

-##################

-*_VS2005EXP_IA32_ASL_FAMILY         = INTEL

-

-*_VS2005EXP_IA32_ASL_NAME           = iasl.exe

-

+#   UINIXGCC         - UINIX GCC

+*_UNIXGCC_*_*_FAMILY             = GCC

 

-####################################################################################

-#

-# Microsoft Visual Studio 2005 Standard Edition (IA-32 Only, with no Link Time Code Generation)

-#

-# Uncomment this section to use these tools or install in an alternate location

-# if more than one version of VS2005 is installed on a single system.

-#

-####################################################################################

-#   VS2005STD        - Microsoft Visual Studio 2005 Standard Edition

-#*_VS2005STD_*_*_FAMILY              = MSFT

-#*_VS2005STD_IA32_*_PATH             = C:\Program Files\Microsoft Visual Studio 8\Vc\bin

-#*_VS2005STD_IA32_*_DPATH            = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE

-#*_VS2005STD_IA32_ASM_PATH           = C:\WINDDK\3790.1830\bin\x86

-#*_VS2005STD_IA32_ASMLINK_PATH       = C:\WINDDK\3790.1830\bin\bin16

-*_VS2005STD_EBC_*_PATH              = C:\Program Files\Intel\EBC\Bin

-*_VS2005STD_*_ASL_PATH              = C:\ASL

-

-#*_VS2005STD_*_CC_NAME               = cl.exe

-#*_VS2005STD_*_SLINK_NAME            = lib.exe

-#*_VS2005STD_*_DLINK_NAME            = link.exe

-#*_VS2005STD_*_ASMLINK_NAME          = link.exe

-#*_VS2005STD_*_PP_NAME               = cl.exe

-#*_VS2005STD_*_APP_NAME              = cl.exe

-#*_VS2005STD_*_VFRPP_NAME            = cl.exe

-#*_VS2005STD_*_PCH_NAME              = cl.exe

-

-#*_VS2005STD_*_SLINK_FLAGS                = /NOLOGO /LTCG

-#*_VS2005STD_*_APP_FLAGS                  = /nologo /E /TC

-#*_VS2005STD_*_PP_FLAGS                   = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

-#*_VS2005STD_*_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h

+*_UNIXGCC_*_DLINK_FLAGS                  = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _$(ENTRYPOINT) --file-alignment 0x20 --section-alignment 0x20

+*_UNIXGCC_*_ASM_FLAGS                    = -c -imacros $(DEST_DIR_DEBUG)/AutoGen.h

+*_UNIXGCC_*_PP_FLAGS                     = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h

+*_UNIXGCC_*_VFRPP_FLAGS                  = -x c -E -P -DVFRCOMPILE --include AutoGen.h

 

 ##################

 # IA32 definitions

 ##################

-#*_VS2005STD_IA32_ASM_NAME           = ml.exe

+*_UNIXGCC_IA32_CC_PATH              = DEF(PEGCC_BIN32)/gcc

+*_UNIXGCC_IA32_SLINK_PATH           = DEF(PEGCC_BIN32)/ar

+*_UNIXGCC_IA32_DLINK_PATH           = DEF(PEGCC_BIN32)/ld

+*_UNIXGCC_IA32_ASM_PATH             = DEF(PEGCC_BIN32)/gcc

+*_UNIXGCC_IA32_PP_PATH              = DEF(PEGCC_BIN32)/gcc

+*_UNIXGCC_IA32_VFRPP_PATH           = DEF(PEGCC_BIN32)/cc

 

-#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

-#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

-#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

-#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

-#DEBUG_VS2005STD_IA32_ASM_FLAGS           = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi

-#RELEASE_VS2005STD_IA32_ASM_FLAGS         = /nologo /W3 /WX /c /coff /Cx /Zd /W0

-#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

-#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

-#*_VS2005STD_IA32_ASMLINK_FLAGS           = /link /nologo /tiny

+*_UNIXGCC_IA32_CC_FLAGS                  = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h

 

 ##################

-# EBC definitions

-##################

-*_VS2005STD_EBC_*_FAMILY            = INTEL

-

-*_VS2005STD_EBC_PP_NAME             = iec.exe

-*_VS2005STD_EBC_CC_NAME             = iec.exe

-*_VS2005STD_EBC_DLINK_NAME          = link.exe

-*_VS2005STD_EBC_SLINK_NAME          = link.exe

-

-*_VS2005STD_EBC_PP_FLAGS                 = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

-*_VS2005STD_EBC_CC_FLAGS                 = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h

-*_VS2005STD_EBC_SLINK_FLAGS              = /lib /NOLOGO /MACHINE:EBC

-*_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

-

-##################

-# ASL definitions

+# X64 definitions

 ##################

-*_VS2005STD_*_ASL_FAMILY            = INTEL

-

-*_VS2005STD_*_ASL_NAME              = iasl.exe

+*_UNIXGCC_X64_CC_PATH               = DEF(PEGCC_BINX64)/gcc

+*_UNIXGCC_X64_SLINK_PATH            = DEF(PEGCC_BINX64)/ar

+*_UNIXGCC_X64_DLINK_PATH            = DEF(PEGCC_BINX64)/ld

+*_UNIXGCC_X64_ASM_PATH              = DEF(PEGCC_BINX64)/gcc

+*_UNIXGCC_X64_PP_PATH               = DEF(PEGCC_BINX64)/gcc

+*_UNIXGCC_X64_VFRPP_PATH            = DEF(PEGCC_BINX64)/gcc

 

+*_UNIXGCC_X64_CC_FLAGS                   = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h -D_EFI_P64

 

 ####################################################################################

 #

-# Microsoft Visual Studio 2005 Professional Edition (IA-32 and X64 Only, with Link Time Code Generation)

+# Cygwin GCC

 #

 ####################################################################################

-#   VS2005PRO        - Microsoft Visual Studio 2005 Professional Edition

-*_VS2005PRO_*_*_FAMILY              = MSFT

-

-*_VS2005PRO_IA32_*_PATH             = C:\Program Files\Microsoft Visual Studio 8\Vc\bin

-*_VS2005PRO_IA32_*_DPATH            = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE

-*_VS2005PRO_IA32_ASM_PATH           = C:\WINDDK\3790.1830\bin\x86

-*_VS2005PRO_IA32_ASMLINK_PATH       = C:\WINDDK\3790.1830\bin\bin16

-*_VS2005PRO_X64_*_PATH              = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_amd64

-*_VS2005PRO_X64_*_DPATH             = C:\Program Files\Microsoft Visual Studio 8\VC\bin\x86_amd64;C:\Program Files\Microsoft Visual Studio 8\Common7\IDE

-*_VS2005PRO_X64_ASMLINK_PATH        = C:\WINDDK\3790.1830\bin\bin16

-*_VS2005PRO_EBC_*_PATH              = C:\Program Files\Intel\EBC\Bin

-*_VS2005PRO_*_ASL_PATH              = C:\ASL

-

-*_VS2005PRO_*_CC_NAME               = cl.exe

-*_VS2005PRO_*_SLINK_NAME            = lib.exe

-*_VS2005PRO_*_DLINK_NAME            = link.exe

-*_VS2005PRO_*_ASMLINK_NAME          = link.exe

-*_VS2005PRO_*_PP_NAME               = cl.exe

-*_VS2005PRO_*_APP_NAME              = cl.exe

-*_VS2005PRO_*_VFRPP_NAME            = cl.exe

-*_VS2005PRO_*_PCH_NAME              = cl.exe

-

-*_VS2005PRO_*_SLINK_FLAGS                = /NOLOGO /LTCG

-*_VS2005PRO_*_APP_FLAGS                  = /nologo /E /TC

-*_VS2005PRO_*_PP_FLAGS                   = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

-*_VS2005PRO_*_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h

-

-##################

-# IA32 definitions

-##################

-*_VS2005PRO_IA32_ASM_NAME           = ml.exe

-

-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

-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

-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

-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

-DEBUG_VS2005PRO_IA32_ASM_FLAGS           = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi

-RELEASE_VS2005PRO_IA32_ASM_FLAGS         = /nologo /W3 /WX /c /coff /Cx /Zd /W0

-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

-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

-*_VS2005PRO_IA32_ASMLINK_FLAGS           = /link /nologo /tiny

-

-##################

-# x64 definitions

-##################

-*_VS2005PRO_X64_ASM_NAME            = ml64.exe

-

-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

-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

-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

-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

-DEBUG_VS2005PRO_X64_ASM_FLAGS            = /nologo /W3 /WX /c /Cx /Zd /Zi

-RELEASE_VS2005PRO_X64_ASM_FLAGS          = /nologo /W3 /WX /c /Cx /Zd

-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

-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

-

-##################

-# EBC definitions

-##################

-*_VS2005PRO_EBC_*_FAMILY            = INTEL

-

-*_VS2005PRO_EBC_PP_NAME             = iec.exe

-*_VS2005PRO_EBC_CC_NAME             = iec.exe

-*_VS2005PRO_EBC_DLINK_NAME          = link.exe

-*_VS2005PRO_EBC_SLINK_NAME          = link.exe

-

-*_VS2005PRO_EBC_PP_FLAGS                 = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

-*_VS2005PRO_EBC_CC_FLAGS                 = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h

-*_VS2005PRO_EBC_SLINK_FLAGS              = /lib /NOLOGO /MACHINE:EBC

-*_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

-

-##################

-# ASL definitions

-##################

-*_VS2005PRO_*_ASL_FAMILY            = INTEL

-

-*_VS2005PRO_*_ASL_NAME              = iasl.exe

+#   CYGWINGCC        - CygWin GCC

+*_CYGWINGCC_*_*_FAMILY           = GCC

 

+*_CYGWINGCC_*_*_DPATH               = DEF(CYGWIN_BIN)

+*_CYGWINGCC_*_ASL_PATH              = DEF(ASL_BIN)/iasl.exe

 

-####################################################################################

-#

-# Microsoft Visual Studio 2005 Team Suite Edition (IA-32, X64, and Itanium, with Link Time Code Generation)

-#

-# Uncomment this section to use these tools or install in an alternate location

-# if more than one version of VS2005 is installed on a single system.

-#

-####################################################################################

-#   VS2005TEAMSUITE  - Microsoft Visual Studio 2005 Team Suite Edition

-#*_VS2005TEAMSUITE_*_*_FAMILY        = MSFT

-#*_VS2005TEAMSUITE_IA32_*_PATH       = C:\Program Files\Microsoft Visual Studio 8\Vc\bin

-#*_VS2005TEAMSUITE_IA32_*_DPATH      = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE

-#*_VS2005TEAMSUITE_IA32_ASM_PATH     = C:\WINDDK\3790.1830\bin\x86

-#*_VS2005TEAMSUITE_IA32_ASMLINK_PATH = C:\WINDDK\3790.1830\bin\bin16

-#*_VS2005TEAMSUITE_X64_*_PATH        = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_amd64

-#*_VS2005TEAMSUITE_X64_*_DPATH       = C:\Program Files\Microsoft Visual Studio 8\VC\bin\x86_amd64;C:\Program Files\Microsoft Visual Studio 8\Common7\IDE

-#*_VS2005TEAMSUITE_X64_ASMLINK_PATH  = C:\WINDDK\3790.1830\bin\bin16

-#*_VS2005TEAMSUITE_IPF_*_PATH        = C:\Program Files\Microsoft Visual Studio 8\Vc\bin

-#*_VS2005TEAMSUITE_IPF_*_DPATH       = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE

-*_VS2005TEAMSUITE_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin

-*_VS2005TEAMSUITE_*_ASL_PATH        = C:\ASL

-

-#*_VS2005TEAMSUITE_*_CC_NAME         = cl.exe

-#*_VS2005TEAMSUITE_*_SLINK_NAME      = lib.exe

-#*_VS2005TEAMSUITE_*_DLINK_NAME      = link.exe

-#*_VS2005TEAMSUITE_*_ASMLINK_NAME    = link.exe

-#*_VS2005TEAMSUITE_*_PP_NAME         = cl.exe

-#*_VS2005TEAMSUITE_*_APP_NAME        = cl.exe

-#*_VS2005TEAMSUITE_*_VFRPP_NAME      = cl.exe

-#*_VS2005TEAMSUITE_*_PCH_NAME        = cl.exe

-

-#*_VS2005TEAMSUITE_*_SLINK_FLAGS          = /NOLOGO /LTCG

-#*_VS2005TEAMSUITE_*_APP_FLAGS            = /nologo /E /TC

-#*_VS2005TEAMSUITE_*_PP_FLAGS             = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

-#*_VS2005TEAMSUITE_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h

+*_CYGWINGCC_*_DLINK_FLAGS                = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _$(ENTRYPOINT) --file-alignment 0x20 --section-alignment 0x20

+*_CYGWINGCC_*_ASM_FLAGS                  = -c -imacros AutoGen.h

+*_CYGWINGCC_*_PP_FLAGS                   = -E -x assembler-with-cpp -include AutoGen.h

+*_CYGWINGCC_*_VFRPP_FLAGS                = -x c -E -P -DVFRCOMPILE --include AutoGen.h

 

 ##################

 # IA32 definitions

 ##################

-#*_VS2005TEAMSUITE_IA32_ASM_NAME     = ml.exe

-

-#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

-#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

-#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

-#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

-#DEBUG_VS2005TEAMSUITE_IA32_ASM_FLAGS     = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi

-#RELEASE_VS2005TEAMSUITE_IA32_ASM_FLAGS   = /nologo /W3 /WX /c /coff /Cx /Zd /W0

-#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

-#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

-#*_VS2005TEAMSUITE_IA32_ASMLINK_FLAGS     = /link /nologo /tiny

-

-##################

-# x64 definitions

-##################

-#*_VS2005TEAMSUITE_X64_ASM_NAME      = ml64.exe

-

-#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

-#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

-#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

-#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

-#DEBUG_VS2005TEAMSUITE_X64_ASM_FLAGS      = /nologo /W3 /WX /c /Cx /Zd /Zi

-#RELEASE_VS2005TEAMSUITE_X64_ASM_FLAGS    = /nologo /W3 /WX /c /Cx /Zd

-#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

-#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

-

-##################

-# IPF definitions

-##################

-#*_VS2005TEAMSUITE_IPF_ASM_NAME      = ias.exe

-

-#*_VS2005TEAMSUITE_IPF_PP_FLAGS           = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

-#DEBUG_VS2005TEAMSUITE_IPF_CC_FLAGS       = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi

-#RELEASE_VS2005TEAMSUITE_IPF_CC_FLAGS     = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h

-#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

-#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

-#DEBUG_VS2005TEAMSUITE_IPF_ASM_FLAGS      = -N us -X explicit -M ilp64 -N so -W4 -d debug

-#RELEASE_VS2005TEAMSUITE_IPF_ASM_FLAGS    = -N us -X explicit -M ilp64 -N so -W4

-#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

-#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

-

-##################

-# EBC definitions

-##################

-*_VS2005TEAMSUITE_EBC_*_FAMILY      = INTEL

+*_CYGWINGCC_IA32_CC_PATH            = DEF(CYGWIN_BIN32)/gcc

+*_CYGWINGCC_IA32_SLINK_PATH         = DEF(CYGWIN_BIN32)/ar

+*_CYGWINGCC_IA32_DLINK_PATH         = DEF(CYGWIN_BIN32)/ld

+*_CYGWINGCC_IA32_ASM_PATH           = DEF(CYGWIN_BIN32)/gcc

+*_CYGWINGCC_IA32_PP_PATH            = DEF(CYGWIN_BIN32)/gcc

+*_CYGWINGCC_IA32_VFRPP_PATH         = DEF(CYGWIN_BIN32)/gcc

 

-*_VS2005TEAMSUITE_EBC_PP_NAME       = iec.exe

-*_VS2005TEAMSUITE_EBC_CC_NAME       = iec.exe

-*_VS2005TEAMSUITE_EBC_DLINK_NAME    = link.exe

-*_VS2005TEAMSUITE_EBC_SLINK_NAME    = link.exe

+*_CYGWINGCC_IA32_CC_FLAGS                = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include AutoGen.h

 

-*_VS2005TEAMSUITE_EBC_PP_FLAGS           = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

-*_VS2005TEAMSUITE_EBC_CC_FLAGS           = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h

-*_VS2005TEAMSUITE_EBC_SLINK_FLAGS        = /lib /NOLOGO /MACHINE:EBC

-*_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

-

-##################

-# ASL definitions

 ##################

-*_VS2005TEAMSUITE_*_ASL_FAMILY      = INTEL

-

-*_VS2005TEAMSUITE_*_ASL_NAME        = iasl.exe

-

-

-####################################################################################

-#

-# Unix GCC

-#

-####################################################################################

-#   UINIXGCC         - UINIX GCC

-*_UNIXGCC_IA32_*_FAMILY             = GCC

-

-*_UNIXGCC_IA32_*_PATH               = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin

-*_UNIXGCC_X64_*_PATH                = /opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin

-

-*_UNIXGCC_IA32_CC_NAME              = gcc

-*_UNIXGCC_IA32_SLINK_NAME           = ar

-*_UNIXGCC_IA32_DLINK_NAME           = ld

-*_UNIXGCC_IA32_ASM_NAME             = gcc

-*_UNIXGCC_IA32_PP_NAME              = gcc

-*_UNIXGCC_IA32_VFRPP_NAME           = gcc

-*_UNIXGCC_IA32_CC_FLAGS                  = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include $(DEST_DIR_DEBUG)/AutoGen.h

-

-##################

-# x64 definitions

+# X64 definitions

 ##################

-*_UNIXGCC_X64_*_FAMILY              = GCC

-

-*_UNIXGCC_X64_CC_NAME               = gcc

-*_UNIXGCC_X64_SLINK_NAME            = ar

-*_UNIXGCC_X64_DLINK_NAME            = ld

-*_UNIXGCC_X64_ASM_NAME              = gcc

-*_UNIXGCC_X64_PP_NAME               = gcc

-*_UNIXGCC_X64_VFRPP_NAME            = gcc

-*_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

-

-*_UNIXGCC_*_DLINK_FLAGS                  = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _$(ENTRYPOINT) --file-alignment 0x20 --section-alignment 0x20

-*_UNIXGCC_*_ASM_FLAGS                    = -c -imacros $(DEST_DIR_DEBUG)/AutoGen.h

-*_UNIXGCC_*_PP_FLAGS                     = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h

-*_UNIXGCC_*_VFRPP_FLAGS                  = -x c -E -P -DVFRCOMPILE --include AutoGen.h

-

-

-####################################################################################

-#

-# Cygwin GCC

-#

-####################################################################################

-#   CYGWINGCC        - CygWin GCC

-*_CYGWINGCC_IA32_*_FAMILY           = GCC

-

-*_CYGWINGCC_IA32_*_PATH             = c:/cygwin/opt/tiano/i386-tiano-pe/i386-tiano-pe/bin

-*_CYGWINGCC_X64_*_PATH              = c:/cygwin/opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin

-*_CYGWINGCC_*_*_DPATH               = /bin

-*_CYGWINGCC_*_ASL_PATH              = /cygdrive/c/ASL

-

-*_CYGWINGCC_IA32_CC_NAME            = gcc

-*_CYGWINGCC_IA32_SLINK_NAME         = ar

-*_CYGWINGCC_IA32_DLINK_NAME         = ld

-*_CYGWINGCC_IA32_ASM_NAME           = gcc

-*_CYGWINGCC_IA32_PP_NAME            = gcc

-*_CYGWINGCC_IA32_VFRPP_NAME         = gcc

-*_CYGWINGCC_IA32_ASL_NAME           = iasl.exe

-

-*_CYGWINGCC_IA32_CC_FLAGS                = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include $(DEST_DIR_DEBUG)/AutoGen.h

-

-

-*_CYGWINGCC_X64_*_FAMILY            = GCC

-*_CYGWINGCC_X64_CC_NAME             = gcc

-*_CYGWINGCC_X64_SLINK_NAME          = ar

-*_CYGWINGCC_X64_DLINK_NAME          = ld

-*_CYGWINGCC_X64_ASM_NAME            = gcc

-*_CYGWINGCC_X64_PP_NAME             = gcc

-*_CYGWINGCC_X64_VFRPP_NAME          = gcc

-*_CYGWINGCC_X64_ASL_NAME            = iasl.exe

-

-*_CYGWINGCC_X64_CC_FLAGS                 = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include $(DEST_DIR_DEBUG)/AutoGen.h -D_EFI_P64

-*_CYGWINGCC_*_DLINK_FLAGS                = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _$(ENTRYPOINT) --file-alignment 0x20 --section-alignment 0x20

-*_CYGWINGCC_*_ASM_FLAGS                  = -c -imacros $(DEST_DIR_DEBUG)/AutoGen.h

-*_CYGWINGCC_*_PP_FLAGS                   = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h

-*_CYGWINGCC_*_VFRPP_FLAGS                = -x c -E -P -DVFRCOMPILE --include AutoGen.h

+*_CYGWINGCC_X64_CC_PATH             = DEF(CYGWIN_BINX64)/gcc

+*_CYGWINGCC_X64_SLINK_PATH          = DEF(CYGWIN_BINX64)/ar

+*_CYGWINGCC_X64_DLINK_PATH          = DEF(CYGWIN_BINX64)/ld

+*_CYGWINGCC_X64_ASM_PATH            = DEF(CYGWIN_BINX64)/gcc

+*_CYGWINGCC_X64_PP_PATH             = DEF(CYGWIN_BINX64)/gcc

+*_CYGWINGCC_X64_VFRPP_PATH          = DEF(CYGWIN_BINX64)/gcc

 

+*_CYGWINGCC_X64_CC_FLAGS                 = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include AutoGen.h -D_EFI_P64

 

 ####################################################################################

 #

@@ -611,14 +312,13 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ####################################################################################

 #   ELFGCC           - Linux ELF GCC

 *_ELFGCC_*_*_FAMILY                 = GCC

-*_ELFGCC_IA32_*_PATH                = /usr/bin

 

-*_ELFGCC_IA32_CC_NAME               = gcc

-*_ELFGCC_IA32_SLINK_NAME            = ar

-*_ELFGCC_IA32_DLINK_NAME            = ld

-*_ELFGCC_IA32_ASM_NAME              = gcc

-*_ELFGCC_IA32_PP_NAME               = gcc

-*_ELFGCC_IA32_VFRPP_NAME            = gcc

+*_ELFGCC_IA32_CC_PATH               = DEF(ELFGCC_BIN)/gcc

+*_ELFGCC_IA32_SLINK_PATH            = DEF(ELFGCC_BIN)/ar

+*_ELFGCC_IA32_DLINK_PATH            = DEF(ELFGCC_BIN)/ld

+*_ELFGCC_IA32_ASM_PATH              = DEF(ELFGCC_BIN)/gcc

+*_ELFGCC_IA32_PP_PATH               = DEF(ELFGCC_BIN)/gcc

+*_ELFGCC_IA32_VFRPP_PATH            = DEF(ELFGCC_BIN)/gcc

 

 *_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

 *_ELFGCC_*_DLINK_FLAGS                   = -melf_i386 -nostdlib -n -q -Ttext 0x220 --entry $(ENTRYPOINT) -u $(ENTRYPOINT)

@@ -634,11 +334,9 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ####################################################################################

 # *_*_EBC_*_FAMILY                   = INTEL

 #

-# *_*_EBC_*_PATH                     = C:\Program Files\Intel\EBC\Bin

-#

-# *_*_EBC_PP_NAME                    = iec.exe

-# *_*_EBC_CC_NAME                    = iec.exe

-# *_*_EBC_SLINK_NAME                 = link.exe

+# *_*_EBC_PP_PATH                    = D:\Intel\EBC\Bin\iec.exe

+# *_*_EBC_CC_PATH                    = D:\Intel\EBC\Bin\iec.exe

+# *_*_EBC_SLINK_PATH                 = D:\Intel\EBC\Bin\link.exe

 #

 # *_*_EBC_SLINK_FLAGS                     = /lib /NOLOGO /MACHINE:EBC

 # *_*_EBC_PP_FLAGS                        = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

@@ -652,9 +350,7 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ####################################################################################

 # *_*_*_ASL_FAMILY                   = INTEL

 #

-# *_*_*_ASL_PATH                     = C:\ASL

-#

-# *_*_*_ASL_NAME                     = iasl.exe

+# *_*_*_ASL_PATH                     = C:\ASL\iasl.exe

 #

 ####################################################################################

 #

@@ -663,9 +359,7 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ####################################################################################

 # *_*_*_ASL_FAMILY                   = MSFT

 #

-# *_*_*_ASL_PATH                     = C:\ASL

-#

-# *_*_*_ASL_NAME                     = asl.exe

+# *_*_*_ASL_PATH                     = C:\ASL\iasl.exe

 #

 

 

@@ -680,35 +374,28 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 #   ICC              - Intel C Compiler V9.1

 *_ICC_*_*_FAMILY                    = INTEL

 

-*_ICC_IA32_*_PATH                   = C:\Program Files\Intel\Compiler\C++\9.1\IA32\Bin

-*_ICC_X64_*_PATH                   = C:\Program Files\Intel\Compiler\C++\9.1\EM64T\Bin

-*_ICC_IPF_*_PATH                    = C:\Program Files\Intel\Compiler\C++\9.1\Itanium\Bin

-DEBUG_ICC_*_ASL_PATH                = C:\ASL

-RELEASE_ICC_*_ASL_PATH              = C:\ASL

+*_ICC_*_ASL_PATH                    = DEF(ASL_BIN)\iasl.exe

 

 *_ICC_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h

+*_ICC_*_APP_FLAGS                        = /nologo /E /TC

+*_ICC_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h

 

 ##################

 # IA32 definitions

 ##################

-*_ICC_IA32_ASM_FAMILY                  = MSFT

-*_ICC_IA32_ASM_PATH                    = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin

-*_ICC_IA32_PCH_NAME                    = icl.exe

-

-*_ICC_IA32_CC_NAME                     = icl.exe

-*_ICC_IA32_SLINK_NAME                  = xilib.exe

-*_ICC_IA32_DLINK_NAME                  = xilink.exe

-*_ICC_IA32_ASMLINK_NAME                = xilink.exe

-*_ICC_IA32_PP_NAME                     = icl.exe

-*_ICC_IA32_VFRPP_NAME                  = icl.exe

-*_ICC_IA32_APP_NAME                    = icl.exe

-*_ICC_IA32_ASM_NAME                    = ml.exe

-

-

-*_ICC_IA32_APP_FLAGS                     = /nologo /E /TC

-*_ICC_IA32_PP_FLAGS                      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

-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

-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

+*_ICC_IA32_PCH_PATH                    = DEF(ICC_BIN32)\icl.exe

+*_ICC_IA32_CC_PATH                     = DEF(ICC_BIN32)\icl.exe

+*_ICC_IA32_SLINK_PATH                  = DEF(ICC_BIN32)\xilib.exe

+*_ICC_IA32_DLINK_PATH                  = DEF(ICC_BIN32)\xilink.exe

+*_ICC_IA32_ASMLINK_PATH                = DEF(ICC_BIN32)\xilink.exe

+*_ICC_IA32_PP_PATH                     = DEF(ICC_BIN32)\icl.exe

+*_ICC_IA32_VFRPP_PATH                  = DEF(ICC_BIN32)\icl.exe

+*_ICC_IA32_APP_PATH                    = DEF(ICC_BIN32)\icl.exe

+*_ICC_IA32_ASM_PATH                    = DEF(VSNET2003_BIN)\ml.exe

+*_ICC_IA32_ASM_DLL                     = DEF(VSNET2003_DLL)

+

+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

+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

 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

 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

 DEBUG_ICC_IA32_ASM_FLAGS                 = /nologo /W3 /WX /c /Zd /W0 /Zi

@@ -720,23 +407,17 @@ RELEASE_ICC_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ##################

 # X64 definitions

 ##################

-*_ICC_X64_ASM_FAMILY                  = MSFT

-*_ICC_X64_ASM_PATH                    = C:\WINDDK\3790.1830\bin\win64\x86\amd64

-*_ICC_X64_PCH_NAME                    = icl.exe

-

-*_ICC_X64_CC_NAME                     = icl.exe

-*_ICC_X64_SLINK_NAME                  = xilib.exe

-*_ICC_X64_DLINK_NAME                  = xilink.exe

-*_ICC_X64_ASMLINK_NAME                = xilink.exe

-*_ICC_X64_PP_NAME                     = icl.exe

-*_ICC_X64_VFRPP_NAME                  = icl.exe

-*_ICC_X64_APP_NAME                    = icl.exe

-*_ICC_X64_ASM_NAME                    = ml64.exe

-

+*_ICC_X64_PCH_PATH                    = DEF(ICC_BINX64)\icl.exe

+*_ICC_X64_CC_PATH                     = DEF(ICC_BINX64)\icl.exe

+*_ICC_X64_SLINK_PATH                  = DEF(ICC_BINX64)\xilib.exe

+*_ICC_X64_DLINK_PATH                  = DEF(ICC_BINX64)\xilink.exe

+*_ICC_X64_ASMLINK_PATH                = DEF(ICC_BINX64)\xilink.exe

+*_ICC_X64_PP_PATH                     = DEF(ICC_BINX64)\icl.exe

+*_ICC_X64_VFRPP_PATH                  = DEF(ICC_BINX64)\icl.exe

+*_ICC_X64_APP_PATH                    = DEF(ICC_BINX64)\icl.exe

+*_ICC_X64_ASM_PATH                    = DEF(WINDDK_BINX64)\ml64.exe

+*_ICC_X64_ASM_DLL                     = DEF(VSNET2003_DLL)

 

-*_ICC_X64_SLINK_FLAGS                = /nologo /LTCG

-*_ICC_X64_APP_FLAGS                  = /nologo /E /TC

-*_ICC_X64_PP_FLAGS                   = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

 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

 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

 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

@@ -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

 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

 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

+*_ICC_X64_SLINK_FLAGS                = /nologo /LTCG

 

 

 ##################

 # IPF definitions

 ##################

-*_ICC_IPF_*_FAMILY                  = INTEL

-

-*_ICC_IPF_CC_NAME                   = icl.exe

-*_ICC_IPF_SLINK_NAME                = xilib.exe

-*_ICC_IPF_DLINK_NAME                = xilink.exe

-*_ICC_IPF_ASMLINK_NAME              = xilink.exe

-*_ICC_IPF_PP_NAME                   = icl.exe

-*_ICC_IPF_VFRPP_NAME                = icl.exe

+*_ICC_IPF_CC_PATH                   = DEF(WINDDK_BIN64)\icl.exe

+*_ICC_IPF_SLINK_PATH                = DEF(WINDDK_BIN64)\xilib.exe

+*_ICC_IPF_DLINK_PATH                = DEF(WINDDK_BIN64)\xilink.exe

+*_ICC_IPF_ASMLINK_PATH              = DEF(WINDDK_BIN64)\xilink.exe

+*_ICC_IPF_PP_PATH                   = DEF(WINDDK_BIN64)\icl.exe

+*_ICC_IPF_VFRPP_PATH                = DEF(WINDDK_BIN64)\icl.exe

 

-#*_ICC_IPF_PCH_NAME                  = icl.exe

-*_ICC_IPF_APP_NAME                  = icl.exe

-*_ICC_IPF_ASM_NAME                  = ias.exe

+*_ICC_IPF_PCH_PATH                  = DEF(WINDDK_BIN64)\icl.exe

+*_ICC_IPF_APP_PATH                  = DEF(WINDDK_BIN64)\icl.exe

+*_ICC_IPF_ASM_PATH                  = DEF(WINDDK_BIN64)\ias.exe

 

-*_ICC_IPF_APP_FLAGS                      = /nologo /E /TC

-*_ICC_IPF_PP_FLAGS                       = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

 DEBUG_ICC_IPF_CC_FLAGS                   = /nologo /W4 /WX /GX /Gy /c /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 /Zi

 RELEASE_ICC_IPF_CC_FLAGS                 = /nologo /W4 /WX /GX /Gy /c /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32

-#DEBUG_ICC_IPF_PCH_FLAGS                  = /nologo /W4 /WX /GX /Gy /c /Os /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC /Zi

-#RELEASE_ICC_IPF_PCH_FLAGS                = /nologo /W4 /WX /GX /Gy /c /Os /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC

+DEBUG_ICC_IPF_PCH_FLAGS                  = /nologo /W4 /WX /GX /Gy /c /Os /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC /Zi

+RELEASE_ICC_IPF_PCH_FLAGS                = /nologo /W4 /WX /GX /Gy /c /Os /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC

 DEBUG_ICC_IPF_ASM_FLAGS                  = -N us -X explicit -M ilp64 -N so -W3 -d debug -F COFF32

 RELEASE_ICC_IPF_ASM_FLAGS                = -N us -X explicit -M ilp64 -N so -W3 -F COFF32

 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

 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

 *_ICC_IPF_SLINK_FLAGS                    = /nologo

 

-##################

-# ASL definitions

-##################

-*_ICC_*_ASL_FAMILY                  = INTEL

-

-*_ICC_*_ASL_NAME                    = iasl.exe

-

 ####################################################################################

 #

 # MYTOOLS

@@ -789,42 +460,32 @@ RELEASE_ICC_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 #   X64  - Microsoft Windows DDK 3790.1830

 #   IPF  - Microsoft Windows DDK 3790.1830

 #   EBC  - Intel EFI Byte Code Compiler

-#   ASL  - Intel ACPI Source Language COmpiler

 #

 ####################################################################################

 #   MYTOOLS          - Settings compatible with previous versions of tools_def.template

 *_MYTOOLS_*_*_FAMILY                = MSFT

 

-DEBUG_MYTOOLS_*_TIANO_PATH          =

-RELEASE_MYTOOLS_*_TIANO_PATH        =

-*_MYTOOLS_IA32_*_PATH               = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin

-*_MYTOOLS_IA32_*_DPATH              = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE

-*_MYTOOLS_IA32_ASMLINK_PATH         = C:\WINDDK\3790.1830\bin\bin16

-*_MYTOOLS_X64_*_PATH                = C:\WINDDK\3790.1830\bin\win64\x86\amd64

-*_MYTOOLS_X64_ASMLINK_PATH          = C:\WINDDK\3790.1830\bin\bin16

-*_MYTOOLS_IPF_*_PATH                = C:\WINDDK\3790.1830\bin\win64\x86

-*_MYTOOLS_EBC_*_PATH                = C:\Program Files\Intel\EBC\Bin

-DEBUG_MYTOOLS_*_ASL_PATH            = C:\ASL

-RELEASE_MYTOOLS_*_ASL_PATH          = C:\ASL

-

-*_MYTOOLS_*_CC_NAME                 = cl.exe

-*_MYTOOLS_*_SLINK_NAME              = lib.exe

-*_MYTOOLS_*_DLINK_NAME              = link.exe

-*_MYTOOLS_*_ASMLINK_NAME            = link.exe

-*_MYTOOLS_*_PP_NAME                 = cl.exe

-*_MYTOOLS_*_VFRPP_NAME              = cl.exe

-*_MYTOOLS_*_APP_NAME                = cl.exe

-*_MYTOOLS_*_ASM_NAME                = ml.exe

+*_MYTOOLS_*_TIANO_PATH              = TianoCompress.exe

+*_MYTOOLS_*_TIANO_GUID                   = A31280AD-481E-41B6-95E8-127F4C984779

 

-*_MYTOOLS_*_VFRPP_FLAGS                  = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h

+*_MYTOOLS_*_ASL_PATH                = DEF(ASL_BIN)\iasl.exe

 

-*_MYTOOLS_*_TIANO_NAME              = TianoCompress.exe

-*_MYTOOLS_*_TIANO_GUID                   = A31280AD-481E-41B6-95E8-127F4C984779

+*_MYTOOLS_*_VFRPP_FLAGS                  = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h

 

 ##################

 # IA32 definitions

 ##################

-*_MYTOOLS_IA32_PCH_NAME             = cl.exe

+*_MYTOOLS_IA32_*_DLL                = DEF(VSNET2003_DLL)

+

+*_MYTOOLS_IA32_CC_PATH              = DEF(VSNET2003_BIN)\cl.exe

+*_MYTOOLS_IA32_SLINK_PATH           = DEF(VSNET2003_BIN)\lib.exe

+*_MYTOOLS_IA32_DLINK_PATH           = DEF(VSNET2003_BIN)\link.exe

+*_MYTOOLS_IA32_ASMLINK_PATH         = DEF(WINDDK_BIN16)\link.exe

+*_MYTOOLS_IA32_PP_PATH              = DEF(VSNET2003_BIN)\cl.exe

+*_MYTOOLS_IA32_VFRPP_PATH           = DEF(VSNET2003_BIN)\cl.exe

+*_MYTOOLS_IA32_APP_PATH             = DEF(VSNET2003_BIN)\cl.exe

+*_MYTOOLS_IA32_ASM_PATH             = DEF(VSNET2003_BIN)\ml.exe

+*_MYTOOLS_IA32_PCH_PATH             = DEF(VSNET2003_BIN)\cl.exe

 

 *_MYTOOLS_IA32_APP_FLAGS                 = /nologo /E /TC

 *_MYTOOLS_IA32_PP_FLAGS                  = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

@@ -842,8 +503,15 @@ RELEASE_MYTOOLS_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ##################

 # x64 definitions

 ##################

-*_MYTOOLS_X64_PCH_NAME              = cl.exe

-*_MYTOOLS_X64_ASM_NAME              = ml64.exe

+*_MYTOOLS_X64_CC_PATH              = DEF(WINDDK_BINX64)\cl.exe

+*_MYTOOLS_X64_SLINK_PATH           = DEF(WINDDK_BINX64)\lib.exe

+*_MYTOOLS_X64_DLINK_PATH           = DEF(WINDDK_BINX64)\link.exe

+*_MYTOOLS_X64_ASMLINK_PATH         = DEF(WINDDK_BIN16)\link.exe

+*_MYTOOLS_X64_PP_PATH              = DEF(WINDDK_BINX64)\cl.exe

+*_MYTOOLS_X64_VFRPP_PATH           = DEF(WINDDK_BINX64)\cl.exe

+*_MYTOOLS_X64_APP_PATH             = DEF(WINDDK_BINX64)\cl.exe

+*_MYTOOLS_X64_ASM_PATH             = DEF(WINDDK_BINX64)\ml64.exe

+*_MYTOOLS_X64_PCH_PATH             = DEF(WINDDK_BINX64)\cl.exe

 

 *_MYTOOLS_X64_SLINK_FLAGS                = /nologo /LTCG

 *_MYTOOLS_X64_APP_FLAGS                  = /nologo /E /TC

@@ -860,8 +528,15 @@ RELEASE_MYTOOLS_X64_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ##################

 # IPF definitions

 ##################

-*_MYTOOLS_IPF_PCH_NAME              = cl.exe

-*_MYTOOLS_IPF_ASM_NAME              = ias.exe

+*_MYTOOLS_IPF_CC_PATH              = DEF(WINDDK_BIN64)\cl.exe

+*_MYTOOLS_IPF_SLINK_PATH           = DEF(WINDDK_BIN64)\lib.exe

+*_MYTOOLS_IPF_DLINK_PATH           = DEF(WINDDK_BIN64)\link.exe

+*_MYTOOLS_IPF_ASMLINK_PATH         = DEF(WINDDK_BIN16)\link.exe

+*_MYTOOLS_IPF_PP_PATH              = DEF(WINDDK_BIN64)\cl.exe

+*_MYTOOLS_IPF_VFRPP_PATH           = DEF(WINDDK_BIN64)\cl.exe

+*_MYTOOLS_IPF_APP_PATH             = DEF(WINDDK_BIN64)\cl.exe

+*_MYTOOLS_IPF_ASM_PATH             = DEF(WINDDK_BIN64)\ias.exe

+*_MYTOOLS_IPF_PCH_PATH             = DEF(WINDDK_BIN64)\cl.exe

 

 *_MYTOOLS_IPF_ASM_OUTPUT                 = "-o "

 

@@ -880,21 +555,15 @@ RELEASE_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 ##################

 # EBC definitions

 ##################

-*_MYTOOLS_EBC_*_FAMILY              = INTEL

+*_MYTOOLS_EBC_*_FAMILY             = INTEL

 

-*_MYTOOLS_EBC_PP_NAME               = iec.exe

-*_MYTOOLS_EBC_CC_NAME               = iec.exe

-*_MYTOOLS_EBC_DLINK_NAME            = link.exe

-*_MYTOOLS_EBC_SLINK_NAME            = link.exe

+*_MYTOOLS_EBC_PP_PATH              = DEF(EBC_BIN)\iec.exe

+*_MYTOOLS_EBC_CC_PATH              = DEF(EBC_BIN)\iec.exe

+*_MYTOOLS_EBC_SLINK_PATH           = DEF(EBC_BIN)\link.exe

+*_MYTOOLS_EBC_DLINK_PATH           = DEF(EBC_BIN)\link.exe

 

-*_MYTOOLS_EBC_PP_FLAGS                   = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

-*_MYTOOLS_EBC_CC_FLAGS                   = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h

+*_MYTOOLS_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h

+*_MYTOOLS_EBC_CC_FLAGS                   = /nologo /c /W3 /WX /FIAutoGen.h

 *_MYTOOLS_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC

 *_MYTOOLS_EBC_DLINK_FLAGS                = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER

 

-##################

-# ASL definitions

-##################

-*_MYTOOLS_*_ASL_FAMILY              = INTEL

-

-*_MYTOOLS_*_ASL_NAME                = iasl.exe

diff --git a/BaseTools/ReadMe.txt b/BaseTools/ReadMe.txt
index 0880b08cc6..f461f05be1 100644
--- a/BaseTools/ReadMe.txt
+++ b/BaseTools/ReadMe.txt
@@ -28,16 +28,16 @@ Notes:
 	 cannot generate AutoGen.* files. Only "build" command can.

 3) build.exe in %WORKSPACE%\BaseTools\Bin\Win32 is generated from following revision of

    Python source code:

-        r658 <buildtools_project>\BaseTools\Source\Python\Autogen

-        r725 <buildtools_project>\BaseTools\Source\Python\build

-        r700 <buildtools_project>\BaseTools\Source\Python\Common

-        r695 <buildtools_project>\BaseTools\Source\Python\CommonDataClass

-        r710 <buildtools_project>\BaseTools\Source\Python\GenFds

+        r729 <buildtools_project>\BaseTools\Source\Python\Autogen

+        r729 <buildtools_project>\BaseTools\Source\Python\build

+        r729 <buildtools_project>\BaseTools\Source\Python\Common

+        r729 <buildtools_project>\BaseTools\Source\Python\CommonDataClass

+        r729 <buildtools_project>\BaseTools\Source\Python\GenFds

         

 4) GenFds.exe has is a combo of the follow python source.(This is a temporary branch)

-        r700 <buildtools_project>\BaseTools\Source\Python\Common

-        r695 <buildtools_project>\BaseTools\Source\Python\CommonDataClass

-        r710 <buildtools_project>\BaseTools\Source\Python\GenFds

+        r729 <buildtools_project>\BaseTools\Source\Python\Common

+        r729 <buildtools_project>\BaseTools\Source\Python\CommonDataClass

+        r729 <buildtools_project>\BaseTools\Source\Python\GenFds

 	

 Brief usage for Migration Tool MigrationMsa2Inf.exe:

 1. Command line format: