Enabled Visual Studio 2005 Professional Edition tool chain

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

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index d5a788312c00100435d15d5a860876f7f2444927..3574c6ce466684c0bddb97973fee66c6cae602dd 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -20,9 +20,17 @@ DEFINE VSNET2003_BIN = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bi
 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 VS2005EXP_DLL = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
+\r
 DEFINE VS2005STD_BIN = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
+DEFINE VS2005STD_DLL = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
+\r
 DEFINE VS2005PRO_BIN = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
+DEFINE VS2005PRO_BINX64 = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_amd64\r
+DEFINE VS2005PRO_DLL = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
+\r
 DEFINE VS2005TS_BIN  = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
+DEFINE VS2005TS_DLL  = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
 \r
 DEFINE WINDDK_BIN16   = C:\WINDDK\3790.1830\bin\bin16\r
 DEFINE WINDDK_BIN32   = C:\WINDDK\3790.1830\bin\x86\r
@@ -32,11 +40,14 @@ DEFINE WINDDK_BIN64   = C:\WINDDK\3790.1830\bin\win64\x86
 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
+\r
 DEFINE EBC_BIN    = C:\Program Files\Intel\EBC\Bin\r
 \r
 DEFINE ELFGCC_BIN    = /usr/bin\r
+\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
+\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
@@ -128,6 +139,67 @@ RELEASE_VS2003_IA32_ASM_FLAGS            = /nologo /W3 /WX /c /coff /Cx /Zd /W0
 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
+# Microsoft Visual Studio 2005\r
+#\r
+####################################################################################\r
+#   VS2005PRO           - Microsoft Visual Studio 2005 Professional Edition\r
+*_VS2005PRO_*_*_FAMILY              = MSFT\r
+\r
+*_VS2005PRO_*_TIANO_PATH            = TianoCompress.exe\r
+*_VS2005PRO_*_TIANO_GUID                 = A31280AD-481E-41B6-95E8-127F4C984779\r
+\r
+*_VS2005PRO_*_ASL_PATH               = DEF(ASL_BIN)\iasl.exe\r
+\r
+\r
+*_VS2005PRO_*_SLINK_FLAGS                = /NOLOGO /LTCG\r
+*_VS2005PRO_*_APP_FLAGS                  = /nologo /E /TC\r
+*_VS2005PRO_*_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h\r
+*_VS2005PRO_*_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+##################\r
+# IA32 definitions\r
+##################\r
+*_VS2005PRO_IA32_*_DLL              = DEF(VS2005PRO_DLL)\r
+\r
+*_VS2005PRO_IA32_CC_PATH            = DEF(VS2005PRO_BIN)\cl.exe\r
+*_VS2005PRO_IA32_VFRPP_PATH         = DEF(VS2005PRO_BIN)\cl.exe\r
+*_VS2005PRO_IA32_SLINK_PATH         = DEF(VS2005PRO_BIN)\lib.exe\r
+*_VS2005PRO_IA32_DLINK_PATH         = DEF(VS2005PRO_BIN)\link.exe\r
+*_VS2005PRO_IA32_ASMLINK_PATH       = DEF(VS2005PRO_BIN)\link.exe\r
+*_VS2005PRO_IA32_APP_PATH           = DEF(VS2005PRO_BIN)\cl.exe\r
+*_VS2005PRO_IA32_PP_PATH            = DEF(VS2005PRO_BIN)\cl.exe\r
+*_VS2005PRO_IA32_ASM_PATH           = DEF(VS2005PRO_BIN)\ml.exe\r
+\r
+  DEBUG_VS2005PRO_IA32_CC_FLAGS          = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
+RELEASE_VS2005PRO_IA32_CC_FLAGS          = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 \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_*_DLL               = DEF(VS2005PRO_DLL)\r
+\r
+*_VS2005PRO_X64_CC_PATH             = DEF(VS2005PRO_BINX64)\cl.exe\r
+*_VS2005PRO_X64_PP_PATH             = DEF(VS2005PRO_BINX64)\cl.exe\r
+*_VS2005PRO_X64_APP_PATH            = DEF(VS2005PRO_BINX64)\cl.exe\r
+*_VS2005PRO_X64_VFRPP_PATH          = DEF(VS2005PRO_BINX64)\cl.exe\r
+*_VS2005PRO_X64_ASM_PATH            = DEF(VS2005PRO_BINX64)\ml64.exe\r
+*_VS2005PRO_X64_SLINK_PATH          = DEF(VS2005PRO_BINX64)\lib.exe\r
+*_VS2005PRO_X64_DLINK_PATH          = DEF(VS2005PRO_BINX64)\link.exe\r
+*_VS2005PRO_X64_ASMLINK_PATH        = DEF(VS2005PRO_BINX64)\link.exe\r
+\r
+  DEBUG_VS2005PRO_X64_CC_FLAGS           = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GF /Zi /Gm \r
+RELEASE_VS2005PRO_X64_CC_FLAGS           = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GF\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
 #\r
 # Microsoft Device Driver Kit 3790.1830 (IA-32, X64, Itanium, with Link Time Code Generation)\r
@@ -149,68 +221,68 @@ RELEASE_VS2003_IA32_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ##################\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
+*_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
+  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
+  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
+  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
 RELEASE_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 /MERGE:.data=.text /MERGE:.rdata=.text\r
-*_WINDDK3790x1830_IA32_ASMLINK_FLAGS     = /link /nologo /tiny\r
+    *_WINDDK3790x1830_IA32_ASMLINK_FLAGS = /link /nologo /tiny\r
 \r
 ##################\r
 # x64 definitions\r
 ##################\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
+*_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
+  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
+  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
+  DEBUG_WINDDK3790x1830_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
 RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
 \r
 ##################\r
 # IPF definitions\r
 ##################\r
-*_WINDDK3790x1830_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
+*_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
+  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
+  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
+  DEBUG_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb /DEBUG\r
 RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
 \r
 ##################\r
@@ -233,7 +305,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 #\r
 ####################################################################################\r
 #   UINIXGCC         - UINIX GCC\r
-*_UNIXGCC_*_*_FAMILY             = GCC\r
+*_UNIXGCC_*_*_FAMILY               = GCC\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
@@ -270,7 +342,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 #\r
 ####################################################################################\r
 #   CYGWINGCC        - CygWin GCC\r
-*_CYGWINGCC_*_*_FAMILY           = GCC\r
+*_CYGWINGCC_*_*_FAMILY              = GCC\r
 \r
 *_CYGWINGCC_*_*_DPATH               = DEF(CYGWIN_BIN)\r
 *_CYGWINGCC_*_ASL_PATH              = DEF(ASL_BIN)/iasl.exe\r
@@ -334,9 +406,9 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 ####################################################################################\r
 # *_*_EBC_*_FAMILY                   = INTEL\r
 #\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
+# *_*_EBC_PP_PATH                    = C:\Program Files\Intel\EBC\Bin\iec.exe\r
+# *_*_EBC_CC_PATH                    = C:\Program Files\Intel\EBC\Bin\iec.exe\r
+# *_*_EBC_SLINK_PATH                 = C:\Program Files\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
@@ -383,16 +455,16 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_ICC_IA32_PCH_PATH                    = DEF(ICC_BIN32)\icl.exe\r
-*_ICC_IA32_CC_PATH                     = DEF(ICC_BIN32)\icl.exe\r
-*_ICC_IA32_SLINK_PATH                  = DEF(ICC_BIN32)\xilib.exe\r
-*_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
+*_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
@@ -407,26 +479,26 @@ RELEASE_ICC_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ##################\r
 # X64 definitions\r
 ##################\r
-*_ICC_X64_PCH_PATH                    = DEF(ICC_BINX64)\icl.exe\r
-*_ICC_X64_CC_PATH                     = DEF(ICC_BINX64)\icl.exe\r
-*_ICC_X64_SLINK_PATH                  = DEF(ICC_BINX64)\xilib.exe\r
-*_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
-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
-RELEASE_ICC_X64_PCH_FLAGS            = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /EHs-c- /GF\r
-DEBUG_ICC_X64_ASM_FLAGS              = /nologo /W3 /WX /c /Cx /Zd /Zi\r
-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
+*_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
+  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
+RELEASE_ICC_X64_PCH_FLAGS                = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /EHs-c- /GF\r
+  DEBUG_ICC_X64_ASM_FLAGS                = /nologo /W3 /WX /c /Cx /Zd /Zi\r
+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
@@ -443,15 +515,15 @@ RELEASE_ICC_X64_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:R
 *_ICC_IPF_APP_PATH                  = DEF(ICC_BIN64)\icl.exe\r
 *_ICC_IPF_ASM_PATH                  = DEF(ICC_BIN64)\ias.exe\r
 \r
-DEBUG_ICC_IPF_CC_FLAGS                   = /nologo /W4 /WX /GX /Gy /c /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 /Zi\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
+  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
+  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
+  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
+      *_ICC_IPF_SLINK_FLAGS              = /nologo\r
 \r
 ####################################################################################\r
 #\r
@@ -487,80 +559,80 @@ RELEASE_ICC_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_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
-DEBUG_MYTOOLS_IA32_CC_FLAGS              = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
+      *_MYTOOLS_IA32_APP_FLAGS           = /nologo /E /TC\r
+      *_MYTOOLS_IA32_PP_FLAGS            = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+  DEBUG_MYTOOLS_IA32_CC_FLAGS            = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
 RELEASE_MYTOOLS_IA32_CC_FLAGS            = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
-DEBUG_MYTOOLS_IA32_PCH_FLAGS             = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
+  DEBUG_MYTOOLS_IA32_PCH_FLAGS           = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
 RELEASE_MYTOOLS_IA32_PCH_FLAGS           = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
-DEBUG_MYTOOLS_IA32_ASM_FLAGS             = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
+  DEBUG_MYTOOLS_IA32_ASM_FLAGS           = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
 RELEASE_MYTOOLS_IA32_ASM_FLAGS           = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
-*_MYTOOLS_IA32_ASMLINK_FLAGS             = /link /nologo /tiny\r
-*_MYTOOLS_IA32_SLINK_FLAGS               = /nologo /LTCG\r
-DEBUG_MYTOOLS_IA32_DLINK_FLAGS           = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
+      *_MYTOOLS_IA32_ASMLINK_FLAGS       = /link /nologo /tiny\r
+      *_MYTOOLS_IA32_SLINK_FLAGS         = /nologo /LTCG\r
+  DEBUG_MYTOOLS_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
 RELEASE_MYTOOLS_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
 \r
 ##################\r
 # x64 definitions\r
 ##################\r
-*_MYTOOLS_X64_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
-*_MYTOOLS_X64_PP_FLAGS                   = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-DEBUG_MYTOOLS_X64_CC_FLAGS               = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF\r
+*_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
+      *_MYTOOLS_X64_PP_FLAGS             = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+  DEBUG_MYTOOLS_X64_CC_FLAGS             = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF\r
 RELEASE_MYTOOLS_X64_CC_FLAGS             = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF\r
-DEBUG_MYTOOLS_X64_PCH_FLAGS              = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /Zi /Gm /EHs-c- /GF\r
+  DEBUG_MYTOOLS_X64_PCH_FLAGS            = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /Zi /Gm /EHs-c- /GF\r
 RELEASE_MYTOOLS_X64_PCH_FLAGS            = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /EHs-c- /GF\r
-DEBUG_MYTOOLS_X64_ASM_FLAGS              = /nologo /W3 /WX /c /Cx /Zd /Zi\r
+  DEBUG_MYTOOLS_X64_ASM_FLAGS            = /nologo /W3 /WX /c /Cx /Zd /Zi\r
 RELEASE_MYTOOLS_X64_ASM_FLAGS            = /nologo /W3 /WX /c /Cx /Zd\r
-DEBUG_MYTOOLS_X64_DLINK_FLAGS            = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+  DEBUG_MYTOOLS_X64_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
 RELEASE_MYTOOLS_X64_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
 \r
 ##################\r
 # IPF definitions\r
 ##################\r
-*_MYTOOLS_IPF_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
-*_MYTOOLS_IPF_APP_FLAGS                  = /nologo /E /TC\r
-*_MYTOOLS_IPF_PP_FLAGS                   = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-DEBUG_MYTOOLS_IPF_CC_FLAGS               = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Zx\r
+*_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
+      *_MYTOOLS_IPF_APP_FLAGS            = /nologo /E /TC\r
+      *_MYTOOLS_IPF_PP_FLAGS             = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+  DEBUG_MYTOOLS_IPF_CC_FLAGS             = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Zx\r
 RELEASE_MYTOOLS_IPF_CC_FLAGS             = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zx\r
-DEBUG_MYTOOLS_IPF_PCH_FLAGS              = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /Zi /Zx\r
+  DEBUG_MYTOOLS_IPF_PCH_FLAGS            = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /Zi /Zx\r
 RELEASE_MYTOOLS_IPF_PCH_FLAGS            = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC /Zx\r
-DEBUG_MYTOOLS_IPF_ASM_FLAGS              = -N us -X explicit -M ilp64 -N so -W4 -d debug\r
+  DEBUG_MYTOOLS_IPF_ASM_FLAGS            = -N us -X explicit -M ilp64 -N so -W4 -d debug\r
 RELEASE_MYTOOLS_IPF_ASM_FLAGS            = -N us -X explicit -M ilp64 -N so -W4\r
-DEBUG_MYTOOLS_IPF_DLINK_FLAGS            = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF /OPT:ICF=10 /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb /DEBUG\r
+  DEBUG_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF /OPT:ICF=10 /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb /DEBUG\r
 RELEASE_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF /OPT:ICF=10 /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
-*_MYTOOLS_IPF_SLINK_FLAGS                = /nologo /LTCG\r
+      *_MYTOOLS_IPF_SLINK_FLAGS          = /nologo /LTCG\r
 \r
 ##################\r
 # EBC definitions\r
 ##################\r
-*_MYTOOLS_EBC_*_FAMILY             = INTEL\r
+*_MYTOOLS_EBC_*_FAMILY              = INTEL\r
 \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
+*_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 /FIAutoGen.h\r
 *_MYTOOLS_EBC_CC_FLAGS                   = /nologo /c /W3 /WX /FIAutoGen.h\r