Merged the latest changes in edk2 tree
authorjwang36 <jwang36@7335b38e-4728-0410-8992-fb3ffe349368>
Wed, 18 Jun 2008 03:23:29 +0000 (03:23 +0000)
committerjwang36 <jwang36@7335b38e-4728-0410-8992-fb3ffe349368>
Wed, 18 Jun 2008 03:23:29 +0000 (03:23 +0000)
git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@1259 7335b38e-4728-0410-8992-fb3ffe349368

Conf/build_rule.template
Conf/target.template
Conf/tools_def.template

index 6c62864..e981caa 100644 (file)
@@ -78,7 +78,7 @@
 \r
 ## Reserved File-Type\r
 #\r
-# Dont't change following names of file types and their associated files,\r
+# Don't change following names of file types and their associated files,\r
 # which are also used in tools' code\r
 #\r
 #   C-Code-File\r
@@ -98,6 +98,7 @@
         ?.cpp\r
         ?.Cpp\r
         ?.CPP\r
+        $(MAKE_FILE)\r
 \r
     <OutputFile>\r
         $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
 [Build.Assembly-Code-File]\r
     <InputFile.MSFT, InputFile.INTEL>\r
         Assembly-Code-File = ?.asm, ?.Asm, ?.ASM\r
+        $(MAKE_FILE)\r
 \r
     <InputFile.GCC>\r
         ?.S\r
+        $(MAKE_FILE)\r
 \r
     <OutputFile>\r
         $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
         "$(ASM)" /Fo${dst} $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii\r
 \r
     <Command.GCC>\r
-        "$(ASM)" -o ${dst} $(ASM_FLAGS) $(INC) ${src}\r
+        "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
+        Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
+        "$(ASM)" -o ${dst} $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii\r
 \r
 [Build.Iasm-Code-File]\r
     <InputFile>\r
         ?.s\r
+        $(MAKE_FILE)\r
 \r
     <OutputFile>\r
         $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
         ?.vfr\r
         ?.Vfr\r
         ?.VFR\r
+        $(MAKE_FILE)\r
 \r
     <OutputFile>\r
         $(DEBUG_DIR)(+)${s_dir}(+)${s_base}.c\r
         "$(PP)" $(VFRPP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i\r
         Trim --vfr-file -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i\r
         -mkdir ${d_path} > NUL 2>&1\r
-        VfrCompile -od ${d_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
+        VfrCompile -l --no-pre-processing --output-directory ${d_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
 \r
 [Build.Object-File]\r
     <InputFile>\r
 #        "$(SLINK)" -cr ${dst} $(SLINK_FLAGS) ${src1} -( ${src2} -)\r
 #\r
 [Build.Static-Library-File]\r
-    <InputFile>\r
+    <InputFile.MSFT, InputFile.Intel>\r
+        ?.lib\r
+        $(LIBS)\r
+        $(MAKE_FILE)\r
+\r
+    <InputFile.GCC>\r
         ?.lib\r
         $(LIBS)\r
+        $(MAKE_FILE)\r
 \r
     <OutputFile>\r
         $(DEBUG_DIR)(+)$(MODULE_NAME).dll\r
         "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) $(LIBS) ${src}\r
 \r
     <Command.GCC>\r
-        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -( $(DLINK_SPATH) $(LIBS) ${src} -)\r
+        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(LIBS) ${src} -\)\r
 \r
 [Build.Dynamic-Library-File]\r
-    <InputFile.MSFT, InputFile.INTEL>\r
-        ?.dll\r
-        $(MODULE_BUILD_DIR)\Makefile\r
-\r
-    <InputFile.GCC>\r
+    <InputFile>\r
         ?.dll\r
-        $(MODULE_BUILD_DIR)\Makefile\r
 \r
     <OutputFile>\r
         $(DEBUG_DIR)(+)$(MODULE_NAME).efi\r
         $(OUTPUT_DIR)(+)$(MODULE_NAME).depex\r
 \r
     <Command>\r
-#       GenDepex -o ${dst} ${src}\r
+        "$(PP)" $(CC_FLAGS) $(APP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i\r
+        Trim --source-code -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i\r
+        GenDepex -t $(MODULE_TYPE) -o ${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
 \r
 [Build.Acpi-Source-Language-File]\r
     <InputFile>\r
 \r
     <Command.MSFT, Command.INTEL>\r
         "$(PP)" $(APP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
-        "$(ASL)" -p ${dst} ${d_path}(+)${s_base}.i\r
+        "$(ASL)" -p ${dst} $(ASL_FLAGS) ${d_path}(+)${s_base}.i\r
 \r
 [Build.Acpi-Table-Code-File]\r
     <InputFile>\r
         ?.asm16, ?.Asm16, ?.ASM16\r
 \r
     <OutputFile>\r
-        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.com\r
+        $(OUTPUT_DIR)(+)${s_base}.com\r
 \r
     <Command.MSFT, Command.INTEL>\r
-        pushd .\r
         cd $(OUTPUT_DIR)(+)${s_dir}\r
-        "$(ASM)" /nologo /omf ${src} /Bl"$(ASMLINK)" $(ASMLINK_FLAGS)\r
-        -$(CP) ${dst} $(OUTPUT_DIR) & popd\r
+        "$(ASM)" /nologo /c /omf /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj ${src}\r
+        "$(ASMLINK)" $(ASMLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj,${dst},,,,\r
 \r
 [Build.Microcode-File]\r
     <InputFile>\r
 \r
     <Command>\r
         GenFw -o ${dst} -j ${src}\r
+        -$(CP) ${dst} $(BIN_DIR)\r
 \r
 [Build.Unicode-Text-File]\r
     <InputFile>\r
index e8e3243..5623e7b 100644 (file)
 #  PROPERTY              Type       Use         Description\r
 #  ----------------      --------   --------    -----------------------------------------------------------\r
 #  ACTIVE_PLATFORM       Filename   Recommended Specify the WORKSPACE relative Path and Filename\r
-#                                               of the platform FPD file that will be used for the build\r
-#                                               This line is required if and only if the current working\r
-#                                               directory does not contain one or more FPD files.\r
+#                                               of the platform description file that will be used for the\r
+#                                               build. This line is required if and only if the current\r
+#                                               working directory does not contain one or more description\r
+#                                               files.\r
 ACTIVE_PLATFORM       = Nt32Pkg/Nt32Pkg.dsc\r
 \r
 #  TARGET                List       Optional    Zero or more of the following: DEBUG, RELEASE,\r
 #                                               UserDefined; separated by a space character.\r
 #                                               If the line is missing or no value is specified, all\r
-#                                               valid targets specified in the FPD file will attempt\r
-#                                               to be built.  The following line will build all platform\r
-#                                               targets.\r
+#                                               valid targets specified in the platform description file \r
+#                                               will attempt to be built. The following line will build all\r
+#                                               platform targets.\r
 TARGET                = DEBUG\r
 \r
 #  TARGET_ARCH           List       Optional    What kind of architecture is the binary being target for.\r
 #                                               One, or more, of the following, IA32, IPF, X64, EBC or ARM.\r
 #                                               Multiple values can be specified on a single line, using\r
 #                                               space charaters to separate the values.  These are used\r
-#                                               during the parsing of an FPD file, restricting the build\r
-#                                               output target(s.)\r
+#                                               during the parsing of an platform description file, \r
+#                                               restricting the build output target(s.)\r
 #                                               The Build Target ARCH is determined by a logical AND of:\r
-#                                               FPD BuildOptions: <SupportedArchitectures> tag\r
+#                                               platform BuildOptions: <SupportedArchitectures> tag\r
 #                                               If not specified, then all valid architectures specified\r
-#                                               in the FPD file, for which tools are available, will be\r
+#                                               in the platform file, for which tools are available, will be\r
 #                                               built.\r
 TARGET_ARCH           = IA32\r
 \r
@@ -63,9 +64,15 @@ TOOL_CHAIN_TAG        = MYTOOLS
 #                                             This feature is only available for "spawn" build mode, and \r
 #                                             only for PLATFORM build. The clean, cleanall or\r
 #                                             stand-alone module build is still using the normal way.\r
-MULTIPLE_THREAD       = Disable\r
+MULTIPLE_THREAD       = Enable\r
 \r
-# MAX_CONCURRENT_THREAD_NUMBER  NUMBER  Optional  The number of concurrent threads. Default is 2. Recommend to\r
+# MAX_CONCURRENT_THREAD_NUMBER  NUMBER  Optional  The number of concurrent threads. Default is 1. Recommend to\r
 #                                                 set this value to one more than the number of your compurter\r
 #                                                 cores or CPUs.\r
-MAX_CONCURRENT_THREAD_NUMBER = 2\r
+MAX_CONCURRENT_THREAD_NUMBER = 1\r
+\r
+# Build rules definition\r
+#\r
+#\r
+BUILD_RULE_CONF = Conf/build_rule.txt\r
+\r
index b53d3ec..7cbffbf 100644 (file)
@@ -20,9 +20,19 @@ 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 VS2005PRO_BIN = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
-DEFINE VS2005TS_BIN  = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
+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 VS2005TEAMSUITE_BIN    = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
+DEFINE VS2005TEAMSUITE_BINX64 = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_amd64\r
+DEFINE VS2005TEAMSUITE_BIN64  = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_ia64\r
+DEFINE VS2005TEAMSUITE_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 +42,31 @@ 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
-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
+# Option 1: Hard coded full path to compiler suite\r
+#DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
+#DEFINE UNIXGCC_X64_PETOOLS_PREFIX  = /opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin\r
+#\r
+# Option 2: Use an environment variable\r
+#DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = ENV(IA32_PETOOLS_PREFIX)\r
+#DEFINE UNIXGCC_X64_PETOOLS_PREFIX  = ENV(X64_PETOOLS_PREFIX)\r
+#\r
+# Option 3: Install the compiler suite into your default paths\r
+#DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = i386-pc-mingw32-\r
+#DEFINE UNIXGCC_X64_PETOOLS_PREFIX  = x86_64-pc-mingw32-\r
+#\r
+# Option 4: Create links under the BaseTools/Bin/gcc/ARCH directory\r
+# Links needed: gcc, ar & ld\r
+#DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = ENV(WORKSPACE)/BaseTools/Bin/gcc/Ia32\r
+#DEFINE UNIXGCC_X64_PETOOLS_PREFIX  = ENV(WORKSPACE)/BaseTools/Bin/gcc/X64\r
+\r
+DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
+DEFINE UNIXGCC_X64_PETOOLS_PREFIX  = /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
@@ -46,7 +76,7 @@ DEFINE ASL_BIN = C:\ASL
 ####################################################################################\r
 #\r
 # format: TARGET_TOOLCHAIN_ARCH_COMMANDTYPE_ATTRIBUTE = <string>\r
-# priorty:\r
+# priority:\r
 #         TARGET_TOOLCHAIN_ARCH_COMMANDTYPE_ATTRIBUTE (Highest)\r
 #         ******_TOOLCHAIN_ARCH_COMMANDTYPE_ATTRIBUTE\r
 #         TARGET_*********_ARCH_COMMANDTYPE_ATTRIBUTE\r
@@ -105,29 +135,173 @@ DEFINE ASL_BIN = C:\ASL
 ##################\r
 *_VS2003_IA32_*_DLL                 = DEF(VSNET2003_DLL)\r
 \r
+*_VS2003_IA32_MAKE_PATH             = DEF(VSNET2003_BIN)\nmake.exe\r
 *_VS2003_IA32_CC_PATH               = DEF(VSNET2003_BIN)\cl.exe\r
 *_VS2003_IA32_VFRPP_PATH            = DEF(VSNET2003_BIN)\cl.exe\r
 *_VS2003_IA32_SLINK_PATH            = DEF(VSNET2003_BIN)\lib.exe\r
 *_VS2003_IA32_DLINK_PATH            = DEF(VSNET2003_BIN)\link.exe\r
-*_VS2003_IA32_ASMLINK_PATH          = DEF(VSNET2003_BIN)\link.exe\r
+*_VS2003_IA32_ASMLINK_PATH          = DEF(WINDDK_BIN16)\link.exe\r
 *_VS2003_IA32_APP_PATH              = DEF(VSNET2003_BIN)\cl.exe\r
 *_VS2003_IA32_PP_PATH               = DEF(VSNET2003_BIN)\cl.exe\r
 *_VS2003_IA32_ASM_PATH              = DEF(VSNET2003_BIN)\ml.exe\r
 *_VS2003_IA32_PCH_PATH              = DEF(VSNET2003_BIN)\cl.exe\r
 \r
-*_VS2003_IA32_APP_FLAGS                  = /nologo /E /TC\r
-*_VS2003_IA32_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h\r
-*_VS2003_IA32_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
-DEBUG_VS2003_IA32_CC_FLAGS               = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
-RELEASE_VS2003_IA32_CC_FLAGS             = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192\r
-DEBUG_VS2003_IA32_PCH_FLAGS              = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-RELEASE_VS2003_IA32_PCH_FLAGS            = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
-DEBUG_VS2003_IA32_ASM_FLAGS              = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
-RELEASE_VS2003_IA32_ASM_FLAGS            = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
-*_VS2003_IA32_SLINK_FLAGS                = /nologo /LTCG\r
-DEBUG_VS2003_IA32_DLINK_FLAGS            = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+      *_VS2003_IA32_MAKE_FLAGS           = /nologo\r
+      *_VS2003_IA32_APP_FLAGS            = /nologo /E /TC\r
+      *_VS2003_IA32_PP_FLAGS             = /nologo /E /TC /FIAutoGen.h\r
+      *_VS2003_IA32_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+  DEBUG_VS2003_IA32_CC_FLAGS             = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Zi /Gm\r
+RELEASE_VS2003_IA32_CC_FLAGS             = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- \r
+  DEBUG_VS2003_IA32_PCH_FLAGS            = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
+RELEASE_VS2003_IA32_PCH_FLAGS            = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+  DEBUG_VS2003_IA32_ASM_FLAGS            = /nologo /c /WX /W3 /coff /Cx /Zd /Zi\r
+RELEASE_VS2003_IA32_ASM_FLAGS            = /nologo /c /WX /W3 /coff /Cx /Zd\r
+      *_VS2003_IA32_SLINK_FLAGS          = /nologo /LTCG\r
+  DEBUG_VS2003_IA32_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
 RELEASE_VS2003_IA32_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /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
+*_VS2005PRO_*_MAKE_PATH             = DEF(VS2005PRO_BIN)\nmake.exe\r
+\r
+*_VS2005PRO_*_MAKE_FLAGS                 = /nologo\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(WINDDK_BIN16)\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          = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
+RELEASE_VS2005PRO_IA32_CC_FLAGS          = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
+  DEBUG_VS2005PRO_IA32_ASM_FLAGS         = /nologo /c /WX /W3 /Cx /coff /Zd /Zi  \r
+RELEASE_VS2005PRO_IA32_ASM_FLAGS         = /nologo /c /WX /W3 /Cx /coff /Zd\r
+  DEBUG_VS2005PRO_IA32_DLINK_FLAGS       = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG   \r
+RELEASE_VS2005PRO_IA32_DLINK_FLAGS       = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+      *_VS2005PRO_IA32_ASMLINK_FLAGS     = /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 /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm \r
+RELEASE_VS2005PRO_X64_CC_FLAGS           = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF\r
+  DEBUG_VS2005PRO_X64_ASM_FLAGS          = /nologo /c /WX /W3 /Cx /Zd /Zi\r
+RELEASE_VS2005PRO_X64_ASM_FLAGS          = /nologo /c /WX /W3 /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:$(IMAGE_ENTRY_POINT) /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:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+\r
+####################################################################################\r
+#   VS2005TEAMSUITE           - Microsoft Visual Studio 2005 Team Suite Edition\r
+*_VS2005TEAMSUITE_*_*_FAMILY        = MSFT\r
+\r
+*_VS2005TEAMSUITE_*_TIANO_PATH      = TianoCompress.exe\r
+*_VS2005TEAMSUITE_*_TIANO_GUID           = A31280AD-481E-41B6-95E8-127F4C984779\r
+\r
+*_VS2005TEAMSUITE_*_ASL_PATH        = DEF(ASL_BIN)\iasl.exe\r
+*_VS2005TEAMSUITE_*_MAKE_PATH       = DEF(VS2005TEAMSUITE_BIN)\nmake.exe\r
+\r
+\r
+*_VS2005TEAMSUITE_*_MAKE_FLAGS           = /nologo\r
+*_VS2005TEAMSUITE_*_SLINK_FLAGS          = /NOLOGO /LTCG\r
+*_VS2005TEAMSUITE_*_APP_FLAGS            = /nologo /E /TC\r
+*_VS2005TEAMSUITE_*_PP_FLAGS             = /nologo /E /TC /FIAutoGen.h\r
+*_VS2005TEAMSUITE_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+##################\r
+# IA32 definitions\r
+##################\r
+*_VS2005TEAMSUITE_IA32_*_DLL        = DEF(VS2005TEAMSUITE_DLL)\r
+\r
+*_VS2005TEAMSUITE_IA32_MAKE_PATH    = DEF(VS2005TEAMSUITE_BIN)\nmake.exe\r
+*_VS2005TEAMSUITE_IA32_CC_PATH      = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
+*_VS2005TEAMSUITE_IA32_VFRPP_PATH   = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
+*_VS2005TEAMSUITE_IA32_SLINK_PATH   = DEF(VS2005TEAMSUITE_BIN)\lib.exe\r
+*_VS2005TEAMSUITE_IA32_DLINK_PATH   = DEF(VS2005TEAMSUITE_BIN)\link.exe\r
+*_VS2005TEAMSUITE_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe\r
+*_VS2005TEAMSUITE_IA32_APP_PATH     = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
+*_VS2005TEAMSUITE_IA32_PP_PATH      = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
+*_VS2005TEAMSUITE_IA32_ASM_PATH     = DEF(VS2005TEAMSUITE_BIN)\ml.exe\r
+\r
+      *_VS2005TEAMSUITE_IA32_MAKE_FLAGS  = /nologo\r
+  DEBUG_VS2005TEAMSUITE_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm\r
+RELEASE_VS2005TEAMSUITE_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
+  DEBUG_VS2005TEAMSUITE_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi  \r
+RELEASE_VS2005TEAMSUITE_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd\r
+  DEBUG_VS2005TEAMSUITE_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG   \r
+RELEASE_VS2005TEAMSUITE_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+      *_VS2005TEAMSUITE_IA32_ASMLINK_FLAGS= /nologo /tiny\r
+\r
+##################\r
+# X64 definitions\r
+##################\r
+*_VS2005TEAMSUITE_X64_*_DLL         = DEF(VS2005TEAMSUITE_DLL)\r
+\r
+*_VS2005TEAMSUITE_X64_CC_PATH       = DEF(VS2005TEAMSUITE_BINX64)\cl.exe\r
+*_VS2005TEAMSUITE_X64_PP_PATH       = DEF(VS2005TEAMSUITE_BINX64)\cl.exe\r
+*_VS2005TEAMSUITE_X64_APP_PATH      = DEF(VS2005TEAMSUITE_BINX64)\cl.exe\r
+*_VS2005TEAMSUITE_X64_VFRPP_PATH    = DEF(VS2005TEAMSUITE_BINX64)\cl.exe\r
+*_VS2005TEAMSUITE_X64_ASM_PATH      = DEF(VS2005TEAMSUITE_BINX64)\ml64.exe\r
+*_VS2005TEAMSUITE_X64_SLINK_PATH    = DEF(VS2005TEAMSUITE_BINX64)\lib.exe\r
+*_VS2005TEAMSUITE_X64_DLINK_PATH    = DEF(VS2005TEAMSUITE_BINX64)\link.exe\r
+\r
+  DEBUG_VS2005TEAMSUITE_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm \r
+RELEASE_VS2005TEAMSUITE_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF\r
+  DEBUG_VS2005TEAMSUITE_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
+RELEASE_VS2005TEAMSUITE_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
+  DEBUG_VS2005TEAMSUITE_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+RELEASE_VS2005TEAMSUITE_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+\r
+##################\r
+# IPF definitions\r
+##################\r
+*_VS2005TEAMSUITE_IPF_*_DLL         = DEF(VS2005TEAMSUITE_DLL)\r
+\r
+*_VS2005TEAMSUITE_IPF_PP_PATH       = DEF(VS2005TEAMSUITE_BIN64)\cl.exe\r
+*_VS2005TEAMSUITE_IPF_APP_PATH      = DEF(VS2005TEAMSUITE_BIN64)\cl.exe\r
+*_VS2005TEAMSUITE_IPF_VFRPP_PATH    = DEF(VS2005TEAMSUITE_BIN64)\cl.exe\r
+*_VS2005TEAMSUITE_IPF_CC_PATH       = DEF(VS2005TEAMSUITE_BIN64)\cl.exe\r
+*_VS2005TEAMSUITE_IPF_ASM_PATH      = DEF(VS2005TEAMSUITE_BIN64)\ias.exe\r
+*_VS2005TEAMSUITE_IPF_SLINK_PATH    = DEF(VS2005TEAMSUITE_BIN64)\lib.exe\r
+*_VS2005TEAMSUITE_IPF_DLINK_PATH    = DEF(VS2005TEAMSUITE_BIN64)\link.exe\r
+\r
+  DEBUG_VS2005TEAMSUITE_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32 /Zi\r
+RELEASE_VS2005TEAMSUITE_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32\r
+  DEBUG_VS2005TEAMSUITE_IPF_ASM_FLAGS    = -N us -X explicit -M ilp64 -N so -W4 -d debug\r
+RELEASE_VS2005TEAMSUITE_IPF_ASM_FLAGS    = -N us -X explicit -M ilp64 -N so -W4\r
+  DEBUG_VS2005TEAMSUITE_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG\r
+RELEASE_VS2005TEAMSUITE_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb\r
+\r
 ####################################################################################\r
 #\r
 # Microsoft Device Driver Kit 3790.1830 (IA-32, X64, Itanium, with Link Time Code Generation)\r
@@ -136,6 +310,9 @@ RELEASE_VS2003_IA32_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 #   WINDDK3790x1830  - Microsoft Windows DDK 3790.1830\r
 *_WINDDK3790x1830_*_*_FAMILY        = MSFT\r
 \r
+*_WINDDK3790x1830_*_MAKE_PATH       = DEF(WINDDK_BIN32)\nmake.exe\r
+*_WINDDK3790x1830_*_MAKE_FLAGS           = /nologo\r
+\r
 *_WINDDK3790x1830_*_PP_FLAGS             = /nologo /E /TC /FIAutoGen.h\r
 *_WINDDK3790x1830_*_APP_FLAGS            = /nologo /E /TC\r
 *_WINDDK3790x1830_*_SLINK_FLAGS          = /nologo /LTCG\r
@@ -149,68 +326,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
-RELEASE_WINDDK3790x1830_IA32_CC_FLAGS    = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192\r
-DEBUG_WINDDK3790x1830_IA32_PCH_FLAGS     = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-RELEASE_WINDDK3790x1830_IA32_PCH_FLAGS   = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
-DEBUG_WINDDK3790x1830_IA32_ASM_FLAGS     = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
-RELEASE_WINDDK3790x1830_IA32_ASM_FLAGS   = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
-DEBUG_WINDDK3790x1830_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\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 /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
+RELEASE_WINDDK3790x1830_IA32_CC_FLAGS    = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
+  DEBUG_WINDDK3790x1830_IA32_PCH_FLAGS   = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
+RELEASE_WINDDK3790x1830_IA32_PCH_FLAGS   = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+  DEBUG_WINDDK3790x1830_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /coff /Cx /Zd /Zi\r
+RELEASE_WINDDK3790x1830_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /coff /Cx /Zd\r
+  DEBUG_WINDDK3790x1830_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
 RELEASE_WINDDK3790x1830_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
-*_WINDDK3790x1830_IA32_ASMLINK_FLAGS     = /link /nologo /tiny\r
+    *_WINDDK3790x1830_IA32_ASMLINK_FLAGS = /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
-RELEASE_WINDDK3790x1830_X64_CC_FLAGS     = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GF\r
-DEBUG_WINDDK3790x1830_X64_PCH_FLAGS      = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm /EHs-c- /GF\r
-RELEASE_WINDDK3790x1830_X64_PCH_FLAGS    = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /EHs-c- /GF\r
-DEBUG_WINDDK3790x1830_X64_ASM_FLAGS      = /nologo /W3 /WX /c /Cx /Zd /Zi\r
-RELEASE_WINDDK3790x1830_X64_ASM_FLAGS    = /nologo /W3 /WX /c /Cx /Zd\r
-DEBUG_WINDDK3790x1830_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+*_WINDDK3790x1830_X64_CC_PATH      = DEF(WINDDK_BINX64)\cl.exe\r
+*_WINDDK3790x1830_X64_SLINK_PATH   = DEF(WINDDK_BINX64)\lib.exe\r
+*_WINDDK3790x1830_X64_DLINK_PATH   = DEF(WINDDK_BINX64)\link.exe\r
+*_WINDDK3790x1830_X64_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe\r
+*_WINDDK3790x1830_X64_PP_PATH      = DEF(WINDDK_BINX64)\cl.exe\r
+*_WINDDK3790x1830_X64_VFRPP_PATH   = DEF(WINDDK_BINX64)\cl.exe\r
+*_WINDDK3790x1830_X64_APP_PATH     = DEF(WINDDK_BINX64)\cl.exe\r
+*_WINDDK3790x1830_X64_PCH_PATH     = DEF(WINDDK_BINX64)\cl.exe\r
+*_WINDDK3790x1830_X64_ASM_PATH     = DEF(WINDDK_BINX64)\ml64.exe\r
+\r
+  DEBUG_WINDDK3790x1830_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
+RELEASE_WINDDK3790x1830_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF\r
+  DEBUG_WINDDK3790x1830_X64_PCH_FLAGS    = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
+RELEASE_WINDDK3790x1830_X64_PCH_FLAGS    = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+  DEBUG_WINDDK3790x1830_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
+RELEASE_WINDDK3790x1830_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
+  DEBUG_WINDDK3790x1830_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
 RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /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 /QIPF_fr32 /Zi\r
-RELEASE_WINDDK3790x1830_IPF_CC_FLAGS     = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FIAutoGen.h /QIPF_fr32\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
+*_WINDDK3790x1830_IPF_CC_PATH      = DEF(WINDDK_BIN64)\cl.exe\r
+*_WINDDK3790x1830_IPF_SLINK_PATH   = DEF(WINDDK_BIN64)\lib.exe\r
+*_WINDDK3790x1830_IPF_DLINK_PATH   = DEF(WINDDK_BIN64)\link.exe\r
+*_WINDDK3790x1830_IPF_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe\r
+*_WINDDK3790x1830_IPF_PP_PATH      = DEF(WINDDK_BIN64)\cl.exe\r
+*_WINDDK3790x1830_IPF_VFRPP_PATH   = DEF(WINDDK_BIN64)\cl.exe\r
+*_WINDDK3790x1830_IPF_APP_PATH     = DEF(WINDDK_BIN64)\cl.exe\r
+*_WINDDK3790x1830_IPF_PCH_PATH     = DEF(WINDDK_BIN64)\cl.exe\r
+*_WINDDK3790x1830_IPF_ASM_PATH     = DEF(WINDDK_BIN64)\ias.exe\r
+\r
+  DEBUG_WINDDK3790x1830_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32 /Zi\r
+RELEASE_WINDDK3790x1830_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32\r
+  DEBUG_WINDDK3790x1830_IPF_PCH_FLAGS    = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi\r
+RELEASE_WINDDK3790x1830_IPF_PCH_FLAGS    = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+  DEBUG_WINDDK3790x1830_IPF_ASM_FLAGS    = -N us -X explicit -M ilp64 -N so -W4 -d debug\r
 RELEASE_WINDDK3790x1830_IPF_ASM_FLAGS    = -N us -X explicit -M ilp64 -N so -W4\r
-DEBUG_WINDDK3790x1830_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb /DEBUG\r
+  DEBUG_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb /DEBUG\r
 RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
 \r
 ##################\r
@@ -222,8 +399,9 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_WINDDK3790x1830_EBC_CC_PATH       = DEF(EBC_BIN)\iec.exe\r
 *_WINDDK3790x1830_EBC_DLINK_PATH    = DEF(EBC_BIN)\link.exe\r
 *_WINDDK3790x1830_EBC_SLINK_PATH    = DEF(EBC_BIN)\link.exe\r
+*_WINDDK3790x1830_EBC_VFRPP_PATH    = DEF(EBC_BIN)\iec.exe\r
 \r
-*_WINDDK3790x1830_EBC_CC_FLAGS           = /nologo /c /W3 /WX /FIAutoGen.h\r
+*_WINDDK3790x1830_EBC_CC_FLAGS           = /nologo /c /WX /W3 /FIAutoGen.h\r
 *_WINDDK3790x1830_EBC_SLINK_FLAGS        = /lib /NOLOGO /MACHINE:EBC\r
 *_WINDDK3790x1830_EBC_DLINK_FLAGS        = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
 \r
@@ -233,36 +411,37 @@ 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 _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20\r
-*_UNIXGCC_*_ASM_FLAGS                    = -c -imacros $(DEST_DIR_DEBUG)/AutoGen.h\r
+*_UNIXGCC_*_DLINK_FLAGS                  = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20 -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
+*_UNIXGCC_*_ASM_FLAGS                    = -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h\r
 *_UNIXGCC_*_PP_FLAGS                     = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
 *_UNIXGCC_*_VFRPP_FLAGS                  = -x c -E -P -DVFRCOMPILE --include AutoGen.h\r
+*_UNIXGCC_*_MAKE_PATH                    = make\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_UNIXGCC_IA32_CC_PATH              = DEF(PEGCC_BIN32)/gcc\r
-*_UNIXGCC_IA32_SLINK_PATH           = DEF(PEGCC_BIN32)/ar\r
-*_UNIXGCC_IA32_DLINK_PATH           = DEF(PEGCC_BIN32)/ld\r
-*_UNIXGCC_IA32_ASM_PATH             = DEF(PEGCC_BIN32)/gcc\r
-*_UNIXGCC_IA32_PP_PATH              = DEF(PEGCC_BIN32)/gcc\r
-*_UNIXGCC_IA32_VFRPP_PATH           = DEF(PEGCC_BIN32)/cc\r
+*_UNIXGCC_IA32_CC_PATH              = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)/gcc\r
+*_UNIXGCC_IA32_SLINK_PATH           = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)/ar\r
+*_UNIXGCC_IA32_DLINK_PATH           = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)/ld\r
+*_UNIXGCC_IA32_ASM_PATH             = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)/gcc\r
+*_UNIXGCC_IA32_PP_PATH              = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)/gcc\r
+*_UNIXGCC_IA32_VFRPP_PATH           = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)/gcc\r
 \r
-*_UNIXGCC_IA32_CC_FLAGS                  = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h\r
+*_UNIXGCC_IA32_CC_FLAGS                  = -O2 -falign-functions -falign-jumps -falign-loops -freorder-blocks -freorder-blocks-and-partition -falign-labels -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h\r
 \r
 ##################\r
 # X64 definitions\r
 ##################\r
-*_UNIXGCC_X64_CC_PATH               = DEF(PEGCC_BINX64)/gcc\r
-*_UNIXGCC_X64_SLINK_PATH            = DEF(PEGCC_BINX64)/ar\r
-*_UNIXGCC_X64_DLINK_PATH            = DEF(PEGCC_BINX64)/ld\r
-*_UNIXGCC_X64_ASM_PATH              = DEF(PEGCC_BINX64)/gcc\r
-*_UNIXGCC_X64_PP_PATH               = DEF(PEGCC_BINX64)/gcc\r
-*_UNIXGCC_X64_VFRPP_PATH            = DEF(PEGCC_BINX64)/gcc\r
+*_UNIXGCC_X64_CC_PATH               = DEF(UNIXGCC_X64_PETOOLS_PREFIX)/gcc\r
+*_UNIXGCC_X64_SLINK_PATH            = DEF(UNIXGCC_X64_PETOOLS_PREFIX)/ar\r
+*_UNIXGCC_X64_DLINK_PATH            = DEF(UNIXGCC_X64_PETOOLS_PREFIX)/ld\r
+*_UNIXGCC_X64_ASM_PATH              = DEF(UNIXGCC_X64_PETOOLS_PREFIX)/gcc\r
+*_UNIXGCC_X64_PP_PATH               = DEF(UNIXGCC_X64_PETOOLS_PREFIX)/gcc\r
+*_UNIXGCC_X64_VFRPP_PATH            = DEF(UNIXGCC_X64_PETOOLS_PREFIX)/gcc\r
 \r
-*_UNIXGCC_X64_CC_FLAGS                   = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h -D_EFI_P64\r
+*_UNIXGCC_X64_CC_FLAGS                   = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-address -Wno-array-bounds -c -include AutoGen.h -D_EFI_P64\r
 \r
 ####################################################################################\r
 #\r
@@ -270,13 +449,15 @@ 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
+*_CYGWINGCC_*_MAKE_PATH             = DEF(VSNET2003_BIN)\nmake.exe\r
 \r
+*_CYGWINGCC_*_MAKE_FLAGS                 = /nologo\r
 *_CYGWINGCC_*_DLINK_FLAGS                = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20\r
-*_CYGWINGCC_*_ASM_FLAGS                  = -c -imacros AutoGen.h\r
+*_CYGWINGCC_*_ASM_FLAGS                  = -c -x assembler -imacros AutoGen.h\r
 *_CYGWINGCC_*_PP_FLAGS                   = -E -x assembler-with-cpp -include AutoGen.h\r
 *_CYGWINGCC_*_VFRPP_FLAGS                = -x c -E -P -DVFRCOMPILE --include AutoGen.h\r
 \r
@@ -290,7 +471,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_CYGWINGCC_IA32_PP_PATH            = DEF(CYGWIN_BIN32)/gcc\r
 *_CYGWINGCC_IA32_VFRPP_PATH         = DEF(CYGWIN_BIN32)/gcc\r
 \r
-*_CYGWINGCC_IA32_CC_FLAGS                = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include AutoGen.h\r
+*_CYGWINGCC_IA32_CC_FLAGS           = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include AutoGen.h\r
 \r
 ##################\r
 # X64 definitions\r
@@ -302,7 +483,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_CYGWINGCC_X64_PP_PATH             = DEF(CYGWIN_BINX64)/gcc\r
 *_CYGWINGCC_X64_VFRPP_PATH          = DEF(CYGWIN_BINX64)/gcc\r
 \r
-*_CYGWINGCC_X64_CC_FLAGS                 = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include AutoGen.h -D_EFI_P64\r
+*_CYGWINGCC_X64_CC_FLAGS            = -Os -fshort-wchar -fno-strict-aliasing -mno-red-zone -Wall -Werror -c -include AutoGen.h -D_EFI_P64\r
 \r
 ####################################################################################\r
 #\r
@@ -334,9 +515,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
@@ -368,14 +549,16 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 # Intel(R) C++ Compiler Version 9.1\r
 #\r
 #   IPF  - Intel(R) C++ Compiler for Itanium(R)Version 9.1  Build 20060928 Package ID: W_CC_C_9.1.032\r
-#   ASL  - Intel ACPI Source Language COmpiler\r
+#   ASL  - Intel ACPI Source Language Compiler\r
 #\r
 ####################################################################################\r
 #   ICC              - Intel C Compiler V9.1\r
 *_ICC_*_*_FAMILY                    = INTEL\r
 \r
 *_ICC_*_ASL_PATH                    = DEF(ASL_BIN)\iasl.exe\r
+*_ICC_*_MAKE_PATH                   = DEF(VS2005TEAMSUITE_BIN)\nmake.exe\r
 \r
+*_ICC_*_MAKE_FLAGS                       = /nologo\r
 *_ICC_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
 *_ICC_*_APP_FLAGS                        = /nologo /E /TC\r
 *_ICC_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h\r
@@ -383,57 +566,65 @@ 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
-\r
-DEBUG_ICC_IA32_CC_FLAGS                  = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
-RELEASE_ICC_IA32_CC_FLAGS                = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Gs8192\r
-DEBUG_ICC_IA32_PCH_FLAGS                 = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Yc /TC /Zi /Gm\r
-RELEASE_ICC_IA32_PCH_FLAGS               = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Yc /TC\r
-DEBUG_ICC_IA32_ASM_FLAGS                 = /nologo /W3 /WX /c /Zd /W0 /Zi\r
-RELEASE_ICC_IA32_ASM_FLAGS               = /nologo /W3 /WX /c /Zd /W0\r
-*_ICC_IA32_SLINK_FLAGS                   = /nologo\r
-DEBUG_ICC_IA32_DLINK_FLAGS               = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+*_ICC_IA32_PCH_PATH                 = DEF(ICC_BIN32)\icl.exe\r
+*_ICC_IA32_CC_PATH                  = DEF(ICC_BIN32)\icl.exe\r
+*_ICC_IA32_SLINK_PATH               = DEF(ICC_BIN32)\xilib.exe\r
+# xilib.exe needs lib.exe from Visual Studio\r
+*_ICC_IA32_SLINK_DLL                = DEF(VS2005TEAMSUITE_BIN)\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(VS2005TEAMSUITE_BIN)\ml.exe\r
+*_ICC_IA32_ASM_DLL                  = DEF(VS2005TEAMSUITE_DLL)\r
+\r
+  DEBUG_ICC_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Zi /Gm\r
+RELEASE_ICC_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF\r
+  DEBUG_ICC_IA32_PCH_FLAGS               = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Yc /TC /Zi /Gm\r
+RELEASE_ICC_IA32_PCH_FLAGS               = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Yc /TC\r
+  DEBUG_ICC_IA32_ASM_FLAGS               = /nologo /c /WX /W3 /Zd /Zi\r
+RELEASE_ICC_IA32_ASM_FLAGS               = /nologo /c /WX /W3 /Zd\r
+      *_ICC_IA32_SLINK_FLAGS             = /nologo\r
+  DEBUG_ICC_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
 RELEASE_ICC_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
 \r
 ##################\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:$(IMAGE_ENTRY_POINT) /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:$(IMAGE_ENTRY_POINT) /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
+# xilib.exe needs lib.exe from Visual Studio\r
+*_ICC_X64_SLINK_DLL                 = DEF(VS2005TEAMSUITE_BIN)\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(VS2005TEAMSUITE_DLL)\r
+\r
+  DEBUG_ICC_X64_CC_FLAGS                 = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF\r
+RELEASE_ICC_X64_CC_FLAGS                 = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF\r
+  DEBUG_ICC_X64_PCH_FLAGS                = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /Zi /Gm /EHs-c- /GF\r
+RELEASE_ICC_X64_PCH_FLAGS                = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /EHs-c- /GF\r
+  DEBUG_ICC_X64_ASM_FLAGS                = /nologo /c /WX /W3 /Cx /Zd /Zi\r
+RELEASE_ICC_X64_ASM_FLAGS                = /nologo /c /WX /W3 /Cx /Zd\r
+  DEBUG_ICC_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+RELEASE_ICC_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+      *_ICC_X64_SLINK_FLAGS              = /nologo /LTCG\r
 \r
 \r
 ##################\r
 # IPF definitions\r
 ##################\r
 *_ICC_IPF_CC_PATH                   = DEF(ICC_BIN64)\icl.exe\r
+# icl.exe needs cl.exe from Visual Studio\r
+*_ICC_IPF_CC_DLL                    = DEF(VS2005TEAMSUITE_BIN)\r
 *_ICC_IPF_SLINK_PATH                = DEF(ICC_BIN64)\xilib.exe\r
+# xilib.exe needs lib.exe from Visual Studio\r
+*_ICC_IPF_SLINK_DLL                 = DEF(VS2005TEAMSUITE_BIN);DEF(VS2005TEAMSUITE_DLL)\r
 *_ICC_IPF_DLINK_PATH                = DEF(ICC_BIN64)\xilink.exe\r
 *_ICC_IPF_ASMLINK_PATH              = DEF(ICC_BIN64)\xilink.exe\r
 *_ICC_IPF_PP_PATH                   = DEF(ICC_BIN64)\icl.exe\r
@@ -443,15 +634,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
-RELEASE_ICC_IPF_CC_FLAGS                 = /nologo /W4 /WX /GX /Gy /c /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32\r
-DEBUG_ICC_IPF_PCH_FLAGS                  = /nologo /W4 /WX /GX /Gy /c /Os /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC /Zi\r
-RELEASE_ICC_IPF_PCH_FLAGS                = /nologo /W4 /WX /GX /Gy /c /Os /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC\r
-DEBUG_ICC_IPF_ASM_FLAGS                  = -N us -X explicit -M ilp64 -N so -W3 -d debug -F COFF32\r
+  DEBUG_ICC_IPF_CC_FLAGS                 = /nologo /c /WX /W4 /GX /Gy /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 /Zi\r
+RELEASE_ICC_IPF_CC_FLAGS                 = /nologo /c /WX /W4 /GX /Gy /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32\r
+  DEBUG_ICC_IPF_PCH_FLAGS                = /nologo /c /WX /W4 /GX /Gy /Os /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC /Zi\r
+RELEASE_ICC_IPF_PCH_FLAGS                = /nologo /c /WX /W4 /GX /Gy /Os /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC\r
+  DEBUG_ICC_IPF_ASM_FLAGS                = -N us -X explicit -M ilp64 -N so -W3 -d debug -F COFF32\r
 RELEASE_ICC_IPF_ASM_FLAGS                = -N us -X explicit -M ilp64 -N so -W3 -F COFF32\r
-DEBUG_ICC_IPF_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:64 /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb /DEBUG\r
+  DEBUG_ICC_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:64 /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb /DEBUG\r
 RELEASE_ICC_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:64 /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
-*_ICC_IPF_SLINK_FLAGS                    = /nologo\r
+      *_ICC_IPF_SLINK_FLAGS              = /nologo\r
 \r
 ####################################################################################\r
 #\r
@@ -470,100 +661,102 @@ RELEASE_ICC_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 \r
 *_MYTOOLS_*_ASL_PATH                = DEF(ASL_BIN)\iasl.exe\r
 \r
+*_MYTOOLS_*_ASL_FLAGS                    = \r
+*_MYTOOLS_*_MAKE_FLAGS                   = /nologo\r
 *_MYTOOLS_*_VFRPP_FLAGS                  = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+*_MYTOOLS_*_APP_FLAGS                    = /nologo /E /TC\r
+*_MYTOOLS_*_PP_FLAGS                     = /nologo /E /TC /FIAutoGen.h\r
+*_MYTOOLS_*_SLINK_FLAGS                  = /nologo /LTCG\r
+\r
+*_MYTOOLS_*_ASM16_PATH            = DEF(VS2005TEAMSUITE_BIN)\ml.exe\r
+*_MYTOOLS_*_ASMLINK16_PATH        = DEF(WINDDK_BIN16)\link.exe\r
+*_MYTOOLS_*_ASMLINK16_FLAGS       = /nologo /tiny\r
+  DEBUG_MYTOOLS_*_ASM16_FLAGS     = /nologo /c /WX /W3 /coff /Cx /Zd /Zi\r
+RELEASE_MYTOOLS_*_ASM16_FLAGS     = /nologo /c /WX /W3 /coff /Cx /Zd\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_MYTOOLS_IA32_*_DLL                = DEF(VSNET2003_DLL)\r
+*_MYTOOLS_IA32_*_DLL                = DEF(VS2005TEAMSUITE_DLL)\r
 \r
-*_MYTOOLS_IA32_CC_PATH              = DEF(VSNET2003_BIN)\cl.exe\r
-*_MYTOOLS_IA32_SLINK_PATH           = DEF(VSNET2003_BIN)\lib.exe\r
-*_MYTOOLS_IA32_DLINK_PATH           = DEF(VSNET2003_BIN)\link.exe\r
+*_MYTOOLS_IA32_MAKE_PATH            = DEF(VS2005TEAMSUITE_BIN)\nmake.exe\r
+*_MYTOOLS_IA32_CC_PATH              = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
+*_MYTOOLS_IA32_SLINK_PATH           = DEF(VS2005TEAMSUITE_BIN)\lib.exe\r
+*_MYTOOLS_IA32_DLINK_PATH           = DEF(VS2005TEAMSUITE_BIN)\link.exe\r
 *_MYTOOLS_IA32_ASMLINK_PATH         = DEF(WINDDK_BIN16)\link.exe\r
-*_MYTOOLS_IA32_PP_PATH              = DEF(VSNET2003_BIN)\cl.exe\r
-*_MYTOOLS_IA32_VFRPP_PATH           = DEF(VSNET2003_BIN)\cl.exe\r
-*_MYTOOLS_IA32_APP_PATH             = DEF(VSNET2003_BIN)\cl.exe\r
-*_MYTOOLS_IA32_ASM_PATH             = DEF(VSNET2003_BIN)\ml.exe\r
-*_MYTOOLS_IA32_PCH_PATH             = DEF(VSNET2003_BIN)\cl.exe\r
-\r
-*_MYTOOLS_IA32_APP_FLAGS                 = /nologo /E /TC\r
-*_MYTOOLS_IA32_PP_FLAGS                  = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-DEBUG_MYTOOLS_IA32_CC_FLAGS              = /nologo /GS- /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
-RELEASE_MYTOOLS_IA32_CC_FLAGS            = /nologo /GS- /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192\r
-DEBUG_MYTOOLS_IA32_PCH_FLAGS             = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-RELEASE_MYTOOLS_IA32_PCH_FLAGS           = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
-DEBUG_MYTOOLS_IA32_ASM_FLAGS             = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
-RELEASE_MYTOOLS_IA32_ASM_FLAGS           = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
-*_MYTOOLS_IA32_ASMLINK_FLAGS             = /link /nologo /tiny\r
-*_MYTOOLS_IA32_SLINK_FLAGS               = /nologo /LTCG\r
-DEBUG_MYTOOLS_IA32_DLINK_FLAGS           = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb\r
+*_MYTOOLS_IA32_PP_PATH              = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
+*_MYTOOLS_IA32_VFRPP_PATH           = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
+*_MYTOOLS_IA32_APP_PATH             = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
+*_MYTOOLS_IA32_ASM_PATH             = DEF(VS2005TEAMSUITE_BIN)\ml.exe\r
+\r
+  DEBUG_MYTOOLS_IA32_CC_FLAGS            = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm \r
+RELEASE_MYTOOLS_IA32_CC_FLAGS            = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
+  DEBUG_MYTOOLS_IA32_ASM_FLAGS           = /nologo /c /WX /W3 /coff /Cx /Zd /Zi\r
+RELEASE_MYTOOLS_IA32_ASM_FLAGS           = /nologo /c /WX /W3 /coff /Cx /Zd\r
+      *_MYTOOLS_IA32_ASMLINK_FLAGS       = /nologo /tiny\r
+  DEBUG_MYTOOLS_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /PDB:$(DEBUG_DIR)/$(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:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text /PDB:$(DEBUG_DIR)/$(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 /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2 /GL /Gy /FIAutoGen.h /Zi /Gm /EHs-c- /GF\r
-RELEASE_MYTOOLS_X64_CC_FLAGS             = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2 /GL /Gy /FIAutoGen.h /EHs-c- /GF\r
-DEBUG_MYTOOLS_X64_PCH_FLAGS              = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /Zi /Gm /EHs-c- /GF\r
-RELEASE_MYTOOLS_X64_PCH_FLAGS            = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /EHs-c- /GF\r
-DEBUG_MYTOOLS_X64_ASM_FLAGS              = /nologo /W3 /WX /c /Cx /Zd /Zi\r
-RELEASE_MYTOOLS_X64_ASM_FLAGS            = /nologo /W3 /WX /c /Cx /Zd\r
-DEBUG_MYTOOLS_X64_DLINK_FLAGS            = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+*_MYTOOLS_X64_*_DLL                 = DEF(VS2005TEAMSUITE_DLL)\r
+\r
+*_MYTOOLS_X64_MAKE_PATH             = DEF(VS2005TEAMSUITE_BIN)\nmake.exe\r
+*_MYTOOLS_X64_CC_PATH               = DEF(VS2005TEAMSUITE_BINX64)\cl.exe\r
+*_MYTOOLS_X64_SLINK_PATH            = DEF(VS2005TEAMSUITE_BINX64)\lib.exe\r
+*_MYTOOLS_X64_DLINK_PATH            = DEF(VS2005TEAMSUITE_BINX64)\link.exe\r
+*_MYTOOLS_X64_PP_PATH               = DEF(VS2005TEAMSUITE_BINX64)\cl.exe\r
+*_MYTOOLS_X64_VFRPP_PATH            = DEF(VS2005TEAMSUITE_BINX64)\cl.exe\r
+*_MYTOOLS_X64_APP_PATH              = DEF(VS2005TEAMSUITE_BINX64)\cl.exe\r
+*_MYTOOLS_X64_ASM_PATH              = DEF(VS2005TEAMSUITE_BINX64)\ml64.exe\r
+\r
+  DEBUG_MYTOOLS_X64_CC_FLAGS             = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm \r
+RELEASE_MYTOOLS_X64_CC_FLAGS             = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
+  DEBUG_MYTOOLS_X64_ASM_FLAGS            = /nologo /c /WX /W3 /Cx /Zd /Zi\r
+RELEASE_MYTOOLS_X64_ASM_FLAGS            = /nologo /c /WX /W3 /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:$(IMAGE_ENTRY_POINT) /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:$(IMAGE_ENTRY_POINT) /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 /FIAutoGen.h /Zx /QIPF_fr32 /Zi\r
-RELEASE_MYTOOLS_IPF_CC_FLAGS             = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FIAutoGen.h /Zx /QIPF_fr32\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
+*_MYTOOLS_IPF_MAKE_PATH             = DEF(WINDDK_BIN32)\nmake.exe\r
+*_MYTOOLS_IPF_CC_PATH               = DEF(WINDDK_BIN64)\cl.exe\r
+*_MYTOOLS_IPF_SLINK_PATH            = DEF(WINDDK_BIN64)\lib.exe\r
+*_MYTOOLS_IPF_DLINK_PATH            = DEF(WINDDK_BIN64)\link.exe\r
+*_MYTOOLS_IPF_ASMLINK_PATH          = DEF(WINDDK_BIN16)\link.exe\r
+*_MYTOOLS_IPF_PP_PATH               = DEF(WINDDK_BIN64)\cl.exe\r
+*_MYTOOLS_IPF_VFRPP_PATH            = DEF(WINDDK_BIN64)\cl.exe\r
+*_MYTOOLS_IPF_APP_PATH              = DEF(WINDDK_BIN64)\cl.exe\r
+*_MYTOOLS_IPF_ASM_PATH              = DEF(WINDDK_BIN64)\ias.exe\r
+\r
+      *_MYTOOLS_IPF_ASM_OUTPUT           = "-o "\r
+\r
+  DEBUG_MYTOOLS_IPF_CC_FLAGS             = /nologo /c /WX /GS- /X /W4 /Gy /Ox /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zx /QIPF_fr32 /Zi\r
+RELEASE_MYTOOLS_IPF_CC_FLAGS             = /nologo /c /WX /GS- /X /W4 /Gy /Ox /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zx /QIPF_fr32 \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:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(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:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(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:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(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_MAKE_PATH             = DEF(VS2005TEAMSUITE_BIN)\nmake.exe\r
+*_MYTOOLS_EBC_PP_PATH               = DEF(EBC_BIN)\iec.exe\r
+*_MYTOOLS_EBC_VFRPP_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_MAKE_FLAGS                 = /nologo\r
 *_MYTOOLS_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h\r
-*_MYTOOLS_EBC_CC_FLAGS                   = /nologo /c /W3 /WX /FIAutoGen.h\r
+*_MYTOOLS_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h\r
+*_MYTOOLS_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
 *_MYTOOLS_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC\r
 *_MYTOOLS_EBC_DLINK_FLAGS                = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
 \r