Updated from the latest changes in EDK2
authorjwang36 <jwang36@7335b38e-4728-0410-8992-fb3ffe349368>
Fri, 31 Aug 2007 05:50:01 +0000 (05:50 +0000)
committerjwang36 <jwang36@7335b38e-4728-0410-8992-fb3ffe349368>
Fri, 31 Aug 2007 05:50:01 +0000 (05:50 +0000)
git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@659 7335b38e-4728-0410-8992-fb3ffe349368

Conf/FrameworkDatabase.template
Conf/build_rule.template [new file with mode: 0644]
Conf/target.template
Conf/tools_def.template

index 518d443..864584a 100644 (file)
@@ -6,11 +6,11 @@
     <Version>0.3</Version>\r
     <Abstract>The Framework Module Development Packaging System Database</Abstract>\r
     <Description>\r
-      This Database tracks all packages and platforms installed in this workspace.\r
+      This Database tracks all packages and archives installed in this workspace.\r
     </Description>\r
     <Copyright>Copyright (c) 2007,  Intel Corporation    All rights reserved.</Copyright>\r
     <License>\r
-      This program and the accompanying materials are licensed and made available \r
+      This program and the accompanying materials are licensed and made available\r
       under the terms and conditions of the BSD License which accompanies this\r
       distribution.  The full text of the license may be found at:\r
         http://opensource.org/licenses/bsd-license.php\r
     <Specification>FRAMEWORK_PACKAGING_SPECIFICATION 0x00090000</Specification>\r
   </FdbHeader>\r
   <PackageList>\r
-    <Filename>MdePkg/MdePkg.spd</Filename>\r
-    <Filename>MdeModulePkg/MdeModulePkg.spd</Filename>\r
-    <Filename>ShellBinPkg/ShellBinPkg.spd</Filename>\r
+    <Filename>MdePkg/MdePkg.nspd</Filename>\r
+    <Filename>MdeModulePkg/MdeModulePkg.nspd</Filename>\r
+    <Filename>IntelFrameworkModulePkg/IntelFrameworkModulePkg.nspd</Filename>\r
+    <Filename>IntelFrameworkPkg/IntelFrameworkPkg.nspd</Filename>\r
+    <Filename>Nt32Pkg/Nt32Pkg.nspd</Filename>\r
+    <Filename>FatBinPkg/FatBinPkg.nspd</Filename>\r
+    <Filename>ShellBinPkg/ShellBinPkg.nspd</Filename>\r
   </PackageList>\r
-  <FarList>\r
-    <Filename FarGuid="91062dfe-0bce-45b1-b3ad-3387d8d29d3f">Dummy</Filename>\r
-  </FarList>\r
-</FrameworkDatabase>
+</FrameworkDatabase>\r
diff --git a/Conf/build_rule.template b/Conf/build_rule.template
new file mode 100644 (file)
index 0000000..e8c5bd4
--- /dev/null
@@ -0,0 +1,300 @@
+#\r
+#  Copyright (c) 2007, Intel Corporation\r
+#\r
+#  All rights reserved. This program and the accompanying materials\r
+#  are licensed and made available under the terms and conditions of the BSD License\r
+#  which accompanies this distribution.  The full text of the license may be found at\r
+#  http://opensource.org/licenses/bsd-license.php\r
+\r
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#  Filename: build_rule.template\r
+#\r
+\r
+## Syntax\r
+#\r
+# "*" is used to indicate that the source files will be processed at the same time.\r
+# "?" is used to indicate that the source files will be processed one by one.\r
+#\r
+# "[" Build.<File-Type>[.<version>][, Build.<File-Type>[.<version>]] "]" <EOL>\r
+#   <InputFile[.<ToolChainFamily>]> <EOL>\r
+#       [File-Type =] (?|*).<File-Extension> [(\n|,|;) (?|*).<File-Extension>]\r
+#\r
+#   <OutputFile[.<ToolChainFamily>]> <EOL>\r
+#       <FileFullPath>\r
+#\r
+#   <Command[.<ToolChainFamily>]> <EOL>\r
+#       <Command1>\r
+#       [<Command2>]\r
+#\r
+\r
+## Placeholders for string substitution\r
+#\r
+#   ${src}      Source file(s) to be built (full path)\r
+#   ${s_path}   Source file directory (absolute path)\r
+#   ${s_dir}    Source file relative directory within a module\r
+#               (Note: ${s_dir} is always equals to "." if source file is given in absolute path.)\r
+#   ${s_name}   Source file name without path\r
+#   ${s_base}   Source file name without extension and path\r
+#   ${s_ext}    Source file extension\r
+#\r
+#   ${dst}      Destination file(s) built from ${src} (full path)\r
+#   ${d_path}   Destination file directory (absolute path)\r
+#   ${d_name}   Destination file name without path\r
+#   ${d_base}   Destination file name without extension and path\r
+#   ${d_ext}    Destination file extension\r
+#\r
+#   (+)         Directory separator\r
+#\r
+\r
+## Macro\r
+#   $(WORKSPACE)        Workspace directory\r
+#   $(OUTPUT_DIR)       Directory for intermediate files for building a module\r
+#   $(DEBUG_DIR)        Directory for files used to debug a module\r
+#   $(BUILD_DIR)        All files for building a platform will be put in this directory\r
+#   $(BIN_DIR)          Common directory for executable files\r
+#   $(FV_DIR)           Directory to store flash image files\r
+#   $(INC)              Search path of current module\r
+#   $(LIBS)             Static library files of current module\r
+#   $(<tool>_FLAGS)     Tools flags of current module\r
+#   $(MODULE_NAME)      Current module name\r
+#   $(MODULE_TYPE)      Current module type\r
+#   $(ARCH)             Architecture of current module\r
+#   $(TOOLCHAIN)        Toolchain used to build current module\r
+#   $(TARGET)           Target of current module (DEBUG/RELEASE)\r
+#   $(<tool>)           Path of tool\r
+#   $(EDK_TOOLS_PATH)   Path of build tools\r
+#   $(<FILE_TYPE_LIST>) File list of each file type\r
+#                       (Note: The macro name is derived from file type name. For example,\r
+#                        C-Code-File will have C_CODE_FILE_LIST macro.)\r
+#\r
+#   $(CP)     copy command\r
+#   $(MV)     move command\r
+#   $(RM)     delete command\r
+#   $(MD)     create dir command\r
+#   $(RD)     remove dir command\r
+#\r
+\r
+## Reserved File-Type\r
+#\r
+# Dont'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
+#   C-Header-File\r
+#   Dynamic-Library-File\r
+#   Static-Library-File\r
+#   Visual-Form-Representation-File\r
+#   Unicode-Text-File\r
+#\r
+\r
+[Build.C-Code-File]\r
+    <InputFile>\r
+        ?.c\r
+        ?.C\r
+        ?.cc\r
+        ?.CC\r
+        ?.cpp\r
+        ?.Cpp\r
+        ?.CPP\r
+\r
+    <OutputFile>\r
+        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
+\r
+    <Command.MSFT, Command.INTEL>\r
+        "$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src}\r
+\r
+    <Command.GCC>\r
+        "$(CC)" -o ${dst} $(CC_FLAGS) $(INC) ${src}\r
+\r
+[Build.C-Header-File]\r
+    <InputFile>\r
+        *.h, *.H\r
+\r
+    <OutputFile>\r
+        $(OUTPUT_DIR)(+)$(MODULE_NAME).gch\r
+        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
+\r
+    <Command>\r
+\r
+\r
+[Build.Assembly-Code-File]\r
+    <InputFile.MSFT, InputFile.INTEL>\r
+        Assembly-Code-File = ?.asm, ?.Asm, ?.ASM\r
+\r
+    <InputFile.GCC>\r
+        ?.S\r
+\r
+    <OutputFile>\r
+        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
+\r
+    <Command.MSFT, Command.INTEL>\r
+        "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
+        Trim --source-code --convert-hex -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\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
+\r
+[Build.Iasm-Code-File]\r
+    <InputFile>\r
+        ?.s\r
+\r
+    <OutputFile>\r
+        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
+\r
+    <Command.MSFT, Command.INTEL>\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) ${d_path}(+)${s_base}.iii\r
+\r
+[Build.Visual-Form-Representation-File]\r
+    <InputFile>\r
+        ?.vfr\r
+        ?.Vfr\r
+        ?.VFR\r
+\r
+    <OutputFile>\r
+        $(DEBUG_DIR)(+)${s_dir}(+)${s_base}.c\r
+\r
+    <Command>\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
+\r
+[Build.Object-File]\r
+    <InputFile>\r
+        *.obj\r
+        *.o\r
+\r
+    <OutputFile>\r
+        $(OUTPUT_DIR)(+)$(MODULE_NAME).lib\r
+\r
+    <Command.MSFT, Command.INTEL>\r
+        "$(SLINK)" $(SLINK_FLAGS) /OUT:${dst} ${src}\r
+\r
+    <Command.GCC>\r
+        "$(SLINK)" -cr ${dst} $(SLINK_FLAGS) ${src}\r
+\r
+#[Build.Object-File, Build.Static-Library-File]\r
+#BUILD_VERSION =  0x00010000\r
+#\r
+#    <InputFile>\r
+#       Object-File = *.obj\r
+#       Static-Library-File = *.lib, *.a\r
+#\r
+#    <OutputFile>\r
+#        $(OUTPUT_DIR)(+)$(MODULE_NAME).lib\r
+#\r
+#    <Command.MSFT>\r
+#        "$(SLINK)" /OUT:${dst} $(SLINK_FLAGS) ${src}\r
+#\r
+#    <Command.GCC>\r
+#        "$(SLINK)" -cr ${dst} $(SLINK_FLAGS) ${src1} -( ${src2} -)\r
+#\r
+[Build.Static-Library-File]\r
+    <InputFile>\r
+        ?.lib\r
+        $(LIBS)\r
+\r
+    <OutputFile>\r
+        $(DEBUG_DIR)(+)$(MODULE_NAME).dll\r
+\r
+    <Command.MSFT, Command.INTEL>\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
+\r
+[Build.Dynamic-Library-File]\r
+    <InputFile>\r
+        ?.dll\r
+\r
+    <OutputFile>\r
+        $(DEBUG_DIR)(+)$(MODULE_NAME).efi\r
+\r
+    <Command>\r
+        GenFw -e $(MODULE_TYPE) -o ${dst} ${src}\r
+        $(CP) ${dst} $(OUTPUT_DIR)\r
+        $(CP) ${dst} $(BIN_DIR)\r
+        -$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)\r
+\r
+[Build.Dependency-Expression-File]\r
+    <InputFile>\r
+        ?.dxs, ?.Dxs, ?.DXS\r
+\r
+    <OutputFile>\r
+        $(OUTPUT_DIR)(+)$(MODULE_NAME).depex\r
+\r
+    <Command>\r
+#       GenDepex -o ${dst} ${src}\r
+\r
+[Build.Acpi-Source-Language-File]\r
+    <InputFile>\r
+        ?.asl, ?.Asl, ?.ASL\r
+\r
+    <OutputFile>\r
+        $(OUTPUT_DIR)(+)${s_base}.aml\r
+\r
+    <Command.MSFT, Command.INTEL>\r
+        "$(PP)" $(APP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
+        Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
+        "$(ASL)" -p ${dst} ${d_path}(+)${s_base}.iii\r
+\r
+[Build.Acpi-Table-Code-File]\r
+    <InputFile>\r
+        ?.aslc\r
+\r
+    <OutputFile>\r
+        $(OUTPUT_DIR)(+)${s_base}.acpi\r
+\r
+    <Command.MSFT, Command.INTEL>\r
+        "$(CC)" /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(INC) ${src}\r
+        "$(DLINK)" /OUT:$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(SLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
+        GenFw -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll\r
+\r
+[Build.Masm16-Code-File]\r
+    <InputFile>\r
+        ?.asm16, ?.Asm16, ?.ASM16\r
+\r
+    <OutputFile>\r
+        $(OUTPUT_DIR)(+)${s_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
+\r
+[Build.Microcode-File]\r
+    <InputFile>\r
+        ?.txt, ?.TXT, ?.Txt\r
+\r
+    <OutputFile>\r
+        $(OUTPUT_DIR)(+)${s_base}.mcb\r
+\r
+    <Command>\r
+        GenFw -o ${dst} -m ${src}\r
+\r
+[Build.Microcode-Binary-File]\r
+    <InputFile>\r
+        *.mcb\r
+\r
+    <OutputFile>\r
+        $(OUTPUT_DIR)(+)$(MODULE_NAME).bin\r
+\r
+    <Command>\r
+        GenFw -o ${dst} -j ${src}\r
+\r
+[Build.Unicode-Text-File]\r
+    <InputFile>\r
+        *.uni, *.Uni, *.UNI\r
+\r
+    <OutputFile>\r
+        $(DEBUG_DIR)(+)AutoGen.c\r
+        $(DEBUG_DIR)(+)AutoGen.h\r
+\r
+    <Command>\r
+\r
index 5b36e18..387816d 100644 (file)
 #\r
 #  PROPERTY              Type       Use         Description\r
 #  ----------------      --------   --------    -----------------------------------------------------------\r
-#  ACTIVE_PLATFORM       Filename   Recommended Specify the WORKSPACE relative Path and Filename \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
-ACTIVE_PLATFORM       = Nt32Pkg/Nt32.dsc\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
+#  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
 TARGET                = DEBUG\r
 \r
-#  TARGET_ARCH           List       Optional    What kind of architecture is the binary being target for. \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
+#                                               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
 #                                               The Build Target ARCH is determined by a logical AND of:\r
 #                                               FPD 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
+#                                               If not specified, then all valid architectures specified\r
+#                                               in the FPD file, for which tools are available, will be\r
 #                                               built.\r
-# TARGET_ARCH           = \r
 TARGET_ARCH           = IA32\r
 \r
-#  TOOL_DEFINITION_FILE  Filename  Optional   Specify the name of the filename to use for specifying \r
-#                                             the tools to use for the build.  If not specified, \r
-#                                             tools_def.txt will be used for the build.  This file \r
-#                                             MUST be located in the WORKSPACE/Tools/Conf directory.\r
+#  TOOL_DEFINITION_FILE  Filename  Optional   Specify the name of the filename to use for specifying\r
+#                                             the tools to use for the build.  If not specified,\r
+#                                             tools_def.txt will be used for the build.  This file\r
+#                                             MUST be located in the WORKSPACE/Conf directory.\r
 TOOL_CHAIN_CONF       = Conf/tools_def.txt\r
 \r
-#  TAGNAME               List      Optional   Specify the name(s) of the tools_def.txt TagName to use.  \r
-#                                             If not specified, all applicable TagName tools will be \r
+#  TAGNAME               List      Optional   Specify the name(s) of the tools_def.txt TagName to use.\r
+#                                             If not specified, all applicable TagName tools will be\r
 #                                             used for the build.  The list uses space character separation.\r
 TOOL_CHAIN_TAG        = MYTOOLS\r
 \r
 #  MULTIPLE_THREAD       FLAG      Optional   Flag to enable multi-thread build. If not specified, default\r
-#                                             is "Disable". If your computer is multi-core or multiple CPUs, \r
-#                                             enabling this feature will bring much benefit. For multi-thread \r
-#                                             built, the log will write to ${BUILD_DIR}/build.log. \r
-#                                             This feature is only for PLATFORM build, and clean, cleanall or\r
-#                                             stand-alone module build is still using the normal way. \r
+#                                             is "Disable". If your computer is multi-core or multiple CPUs,\r
+#                                             enabling this feature will bring much benefit. \r
+#                                             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       = 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 2. Recommend to\r
 #                                                 set this value to one more than the number of your compurter\r
-#                                                 cores or CPUs. \r
+#                                                 cores or CPUs.\r
 MAX_CONCURRENT_THREAD_NUMBER = 2\r
index 5213764..87e5c72 100644 (file)
@@ -41,7 +41,7 @@ IDENTIFIER = Default TOOL_CHAIN_CONF
 #   VS2003           - Microsoft Visual Studio .NET 2003\r
 #   VS2005EXP*       - Microsoft Visual Studio 2005 Express Edition\r
 #   VS2005STD*       - Microsoft Visual Studio 2005 Standard Edition\r
-#   VS2005PRO        - Microsoft Visual Studio 2005 Professional Edition \r
+#   VS2005PRO        - Microsoft Visual Studio 2005 Professional Edition\r
 #   VS2005TEAMSUITE* - Microsoft Visual Studio 2005 Team Suite Edition\r
 #   WINDDK3790x1830  - Microsoft Windows DDK 3790.1830\r
 #   UINIXGCC         - UNIX GCC\r
@@ -63,41 +63,41 @@ IDENTIFIER = Default TOOL_CHAIN_CONF
 \r
 ####################################################################################\r
 #\r
-# Microsoft Visual Studio .NET 2003 (IA-32 only, with Link Time Code Generation) \r
+# Microsoft Visual Studio .NET 2003 (IA-32 only, with Link Time Code Generation)\r
 #\r
 ####################################################################################\r
 #   VS2003           - Microsoft Visual Studio .NET 2003\r
-*_VS2003_IA32_*_FAMILY          = MSFT\r
+*_VS2003_IA32_*_FAMILY              = MSFT\r
 \r
-*_VS2003_IA32_CC_NAME           = cl.exe  \r
-*_VS2003_IA32_VFRPP_NAME        = cl.exe\r
-*_VS2003_IA32_SLINK_NAME        = lib.exe\r
-*_VS2003_IA32_DLINK_NAME        = link.exe\r
-*_VS2003_IA32_ASMLINK_NAME      = link.exe\r
-*_VS2003_IA32_APP_NAME          = cl.exe \r
-*_VS2003_IA32_PP_NAME           = cl.exe \r
-*_VS2003_IA32_ASM_NAME          = ml.exe\r
-*_VS2003_IA32_ASM_EXT           = .asm\r
-*_VS2003_IA32_PCH_NAME          = cl.exe \r
+*_VS2003_IA32_*_PATH                = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
+*_VS2003_IA32_*_DPATH               = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r
+\r
+*_VS2003_IA32_CC_NAME               = cl.exe\r
+*_VS2003_IA32_VFRPP_NAME            = cl.exe\r
+*_VS2003_IA32_SLINK_NAME            = lib.exe\r
+*_VS2003_IA32_DLINK_NAME            = link.exe\r
+*_VS2003_IA32_ASMLINK_NAME          = link.exe\r
+*_VS2003_IA32_APP_NAME              = cl.exe\r
+*_VS2003_IA32_PP_NAME               = cl.exe\r
+*_VS2003_IA32_ASM_NAME              = ml.exe\r
+*_VS2003_IA32_PCH_NAME              = cl.exe\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_VS2003_IA32_*_PATH            = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
-*_VS2003_IA32_*_DPATH           = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r
 \r
-*_VS2003_IA32_APP_FLAGS         = /nologo /P /TC \r
-*_VS2003_IA32_PP_FLAGS          = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h \r
-*_VS2003_IA32_VFRPP_FLAGS       = /nologo /P /TC /DVFRCOMPILE\r
-DEBUG_VS2003_IA32_CC_FLAGS      = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h /Zi /Gm\r
-RELEASE_VS2003_IA32_CC_FLAGS    = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h\r
-DEBUG_VS2003_IA32_PCH_FLAGS     = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-RELEASE_VS2003_IA32_PCH_FLAGS   = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC\r
-DEBUG_VS2003_IA32_ASM_FLAGS     = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
-RELEASE_VS2003_IA32_ASM_FLAGS   = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
-*_VS2003_IA32_SLINK_FLAGS       = /nologo /LTCG\r
-DEBUG_VS2003_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG   \r
-RELEASE_VS2003_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+*_VS2003_IA32_APP_FLAGS                  = /nologo /E /TC\r
+*_VS2003_IA32_PP_FLAGS                   = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_VS2003_IA32_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+DEBUG_VS2003_IA32_CC_FLAGS               = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
+RELEASE_VS2003_IA32_CC_FLAGS             = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
+DEBUG_VS2003_IA32_PCH_FLAGS              = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
+RELEASE_VS2003_IA32_PCH_FLAGS            = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+DEBUG_VS2003_IA32_ASM_FLAGS              = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
+RELEASE_VS2003_IA32_ASM_FLAGS            = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
+*_VS2003_IA32_SLINK_FLAGS                = /nologo /LTCG\r
+DEBUG_VS2003_IA32_DLINK_FLAGS            = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+RELEASE_VS2003_IA32_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
 \r
 \r
 ####################################################################################\r
@@ -108,6 +108,15 @@ RELEASE_VS2003_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /O
 #   WINDDK3790x1830  - Microsoft Windows DDK 3790.1830\r
 *_WINDDK3790x1830_*_*_FAMILY        = MSFT\r
 \r
+*_WINDDK3790x1830_IA32_*_PATH       = C:\WINDDK\3790.1830\bin\x86\r
+*_WINDDK3790x1830_IA32_*_DPATH      = C:\WINDDK\3790.1830\bin\x86\r
+*_WINDDK3790x1830_IA32_ASMLINK_PATH = C:\WINDDK\3790.1830\bin\bin16\r
+*_WINDDK3790x1830_X64_*_PATH        = C:\WINDDK\3790.1830\bin\win64\x86\amd64\r
+*_WINDDK3790x1830_X64_ASMLINK_PATH  = C:\WINDDK\3790.1830\bin\bin16\r
+*_WINDDK3790x1830_IPF_*_PATH        = C:\WINDDK\3790.1830\bin\win64\x86\r
+*_WINDDK3790x1830_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin\r
+*_WINDDK3790x1830_*_ASL_PATH        = C:\ASL\r
+\r
 *_WINDDK3790x1830_*_CC_NAME         = cl.exe\r
 *_WINDDK3790x1830_*_VFRPP_NAME      = cl.exe\r
 *_WINDDK3790x1830_*_SLINK_NAME      = lib.exe\r
@@ -117,414 +126,403 @@ RELEASE_VS2003_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /O
 *_WINDDK3790x1830_*_APP_NAME        = cl.exe\r
 *_WINDDK3790x1830_*_PCH_NAME        = cl.exe\r
 \r
-*_WINDDK3790x1830_*_APP_FLAGS       = /nologo /P /TC\r
-*_WINDDK3790x1830_*_SLINK_FLAGS     = /nologo /LTCG\r
-*_WINDDK3790x1830_*_VFRPP_FLAGS     = /nologo /P /TC /DVFRCOMPILE\r
+*_WINDDK3790x1830_*_APP_FLAGS            = /nologo /E /TC\r
+*_WINDDK3790x1830_*_SLINK_FLAGS          = /nologo /LTCG\r
+*_WINDDK3790x1830_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_WINDDK3790x1830_IA32_ASM_NAME          = ml.exe\r
-*_WINDDK3790x1830_IA32_ASM_EXT           = .asm\r
-*_WINDDK3790x1830_IA32_*_PATH            = C:\WINDDK\3790.1830\bin\x86\r
-*_WINDDK3790x1830_IA32_*_DPATH           = C:\WINDDK\3790.1830\bin\x86\r
-*_WINDDK3790x1830_IA32_ASMLINK_PATH      = C:\WINDDK\3790.1830\bin\bin16\\r
-\r
-*_WINDDK3790x1830_IA32_PP_FLAGS          = /nologo /P /E /TC /FI${DEST_DIR_DEBUG}/AutoGen.h \r
-DEBUG_WINDDK3790x1830_IA32_CC_FLAGS      = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h /Zi /Gm \r
-RELEASE_WINDDK3790x1830_IA32_CC_FLAGS    = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h\r
-DEBUG_WINDDK3790x1830_IA32_PCH_FLAGS     = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC /Zi /Gm \r
-RELEASE_WINDDK3790x1830_IA32_PCH_FLAGS   = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.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
+*_WINDDK3790x1830_IA32_ASM_NAME     = ml.exe\r
+\r
+*_WINDDK3790x1830_IA32_PP_FLAGS          = /nologo /E /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+DEBUG_WINDDK3790x1830_IA32_CC_FLAGS      = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
+RELEASE_WINDDK3790x1830_IA32_CC_FLAGS    = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
+DEBUG_WINDDK3790x1830_IA32_PCH_FLAGS     = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
+RELEASE_WINDDK3790x1830_IA32_PCH_FLAGS   = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+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
-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
+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
 \r
 ##################\r
 # x64 definitions\r
 ##################\r
-*_WINDDK3790x1830_X64_ASM_NAME          = ml64.exe\r
-*_WINDDK3790x1830_X64_ASM_EXT           = .asm\r
-*_WINDDK3790x1830_X64_*_PATH            = C:\WINDDK\3790.1830\bin\win64\x86\amd64\r
-*_WINDDK3790x1830_X64_ASMLINK_PATH      = C:\WINDDK\3790.1830\bin\bin16\\r
+*_WINDDK3790x1830_X64_ASM_NAME      = ml64.exe\r
 \r
-*_WINDDK3790x1830_X64_PP_FLAGS          = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h \r
-DEBUG_WINDDK3790x1830_X64_CC_FLAGS      = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /D EFIX64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h /Zi /Gm /EHs-c- /GF\r
-RELEASE_WINDDK3790x1830_X64_CC_FLAGS    = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /D EFIX64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF\r
-DEBUG_WINDDK3790x1830_X64_PCH_FLAGS     = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /D EFIX64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC /Zi /Gm /EHs-c- /GF\r
-RELEASE_WINDDK3790x1830_X64_PCH_FLAGS   = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /D EFIX64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC /EHs-c- /GF\r
-DEBUG_WINDDK3790x1830_X64_ASM_FLAGS     = /nologo /W3 /WX /c /Cx /Zd /Zi\r
-RELEASE_WINDDK3790x1830_X64_ASM_FLAGS   = /nologo /W3 /WX /c /Cx /Zd\r
-DEBUG_WINDDK3790x1830_X64_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG \r
-RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+*_WINDDK3790x1830_X64_PP_FLAGS           = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+DEBUG_WINDDK3790x1830_X64_CC_FLAGS       = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF\r
+RELEASE_WINDDK3790x1830_X64_CC_FLAGS     = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF\r
+DEBUG_WINDDK3790x1830_X64_PCH_FLAGS      = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm /EHs-c- /GF\r
+RELEASE_WINDDK3790x1830_X64_PCH_FLAGS    = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /EHs-c- /GF\r
+DEBUG_WINDDK3790x1830_X64_ASM_FLAGS      = /nologo /W3 /WX /c /Cx /Zd /Zi\r
+RELEASE_WINDDK3790x1830_X64_ASM_FLAGS    = /nologo /W3 /WX /c /Cx /Zd\r
+DEBUG_WINDDK3790x1830_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
 \r
 ##################\r
 # IPF definitions\r
 ##################\r
-*_WINDDK3790x1830_IPF_ASM_NAME          = ias.exe\r
-*_WINDDK3790x1830_IPF_ASM_EXT           = .s\r
-*_WINDDK3790x1830_IPF_*_PATH            = C:\WINDDK\3790.1830\bin\win64\x86\r
+*_WINDDK3790x1830_IPF_ASM_NAME      = ias.exe\r
 \r
-*_WINDDK3790x1830_IPF_PP_FLAGS          = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h\r
-DEBUG_WINDDK3790x1830_IPF_CC_FLAGS      = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h /Zi\r
-RELEASE_WINDDK3790x1830_IPF_CC_FLAGS    = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h\r
-DEBUG_WINDDK3790x1830_IPF_PCH_FLAGS     = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC /Zi\r
-RELEASE_WINDDK3790x1830_IPF_PCH_FLAGS   = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC\r
-DEBUG_WINDDK3790x1830_IPF_ASM_FLAGS     = -N us -X explicit -M ilp64 -N so -W4 -d debug\r
-RELEASE_WINDDK3790x1830_IPF_ASM_FLAGS   = -N us -X explicit -M ilp64 -N so -W4\r
-DEBUG_WINDDK3790x1830_IPF_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:${ENTRYPOINT} /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:${DEST_DIR_DEBUG}/${BASE_NAME}.map /PDB:${DEST_DIR_DEBUG}/${BASE_NAME}.pdb /DEBUG\r
-RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:${ENTRYPOINT} /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:${DEST_DIR_DEBUG}/${BASE_NAME}.map /PDB:${DEST_DIR_DEBUG}/${BASE_NAME}.pdb \r
+*_WINDDK3790x1830_IPF_PP_FLAGS           = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+DEBUG_WINDDK3790x1830_IPF_CC_FLAGS       = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi\r
+RELEASE_WINDDK3790x1830_IPF_CC_FLAGS     = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+DEBUG_WINDDK3790x1830_IPF_PCH_FLAGS      = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi\r
+RELEASE_WINDDK3790x1830_IPF_PCH_FLAGS    = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+DEBUG_WINDDK3790x1830_IPF_ASM_FLAGS      = -N us -X explicit -M ilp64 -N so -W4 -d debug\r
+RELEASE_WINDDK3790x1830_IPF_ASM_FLAGS    = -N us -X explicit -M ilp64 -N so -W4\r
+DEBUG_WINDDK3790x1830_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb /DEBUG\r
+RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
 \r
 ##################\r
 # EBC definitions\r
 ##################\r
 *_WINDDK3790x1830_EBC_*_FAMILY      = INTEL\r
+\r
 *_WINDDK3790x1830_EBC_PP_NAME       = iec.exe\r
 *_WINDDK3790x1830_EBC_CC_NAME       = iec.exe\r
 *_WINDDK3790x1830_EBC_DLINK_NAME    = link.exe\r
 *_WINDDK3790x1830_EBC_SLINK_NAME    = link.exe\r
-*_WINDDK3790x1830_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin\r
-*_WINDDK3790x1830_EBC_*_SPATH       = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"\r
 \r
-*_WINDDK3790x1830_EBC_PP_FLAGS      = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h \r
-*_WINDDK3790x1830_EBC_CC_FLAGS      = /nologo /c /W3 /WX /FI${DEST_DIR_DEBUG}/AutoGen.h /DSTRING_ARRAY_NAME=${BASE_NAME}Strings \r
-*_WINDDK3790x1830_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC\r
-*_WINDDK3790x1830_EBC_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:${ENTRYPOINT} /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
+*_WINDDK3790x1830_EBC_PP_FLAGS           = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_WINDDK3790x1830_EBC_CC_FLAGS           = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_WINDDK3790x1830_EBC_SLINK_FLAGS        = /lib /NOLOGO /MACHINE:EBC\r
+*_WINDDK3790x1830_EBC_DLINK_FLAGS        = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
 \r
 ##################\r
 # ASL definitions\r
 ##################\r
-*_WINDDK3790x1830_*_ASL_FAMILY  = INTEL\r
-*_WINDDK3790x1830_*_ASL_NAME    = iasl.exe\r
-*_WINDDK3790x1830_*_ASL_PATH    = C:\ASL\r
+*_WINDDK3790x1830_*_ASL_FAMILY      = INTEL\r
+\r
+*_WINDDK3790x1830_*_ASL_NAME        = iasl.exe\r
 \r
 \r
 ####################################################################################\r
 #\r
-# Microsoft Visual Studio 2005 Express Edition (IA-32 Only, with no Link Time Code Generation) \r
+# Microsoft Visual Studio 2005 Express Edition (IA-32 Only, with no Link Time Code Generation)\r
 #\r
 # Uncomment this section to use these tools or install in an alternate location\r
 # if more than one version of VS2005 is installed on a single system.\r
 #\r
 ####################################################################################\r
 #   VS2005EXP        - Microsoft Visual Studio 2005 Express Edition\r
-#*_VS2005EXP_IA32_*_FAMILY       = MSFT\r
-\r
-#*_VS2005EXP_IA32_CC_NAME        = cl.exe\r
-#*_VS2005EXP_IA32_SLINK_NAME     = lib.exe\r
-#*_VS2005EXP_IA32_DLINK_NAME     = link.exe\r
-#*_VS2005EXP_IA32_ASMLINK_NAME   = link.exe\r
-#*_VS2005EXP_IA32_PP_NAME        = cl.exe\r
-#*_VS2005EXP_IA32_APP_NAME       = cl.exe\r
-#*_VS2005EXP_IA32_VFRPP_NAME     = cl.exe\r
-#*_VS2005EXP_IA32_PCH_NAME       = cl.exe\r
-\r
-#*_VS2005EXP_IA32_SLINK_FLAGS       = /NOLOGO /LTCG\r
-#*_VS2005EXP_IA32_APP_FLAGS         = /nologo /P /TC\r
-#*_VS2005EXP_IA32_PP_FLAGS          = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h \r
-#*_VS2005EXP_IA32_VFRPP_FLAGS       = /nologo /P /TC /DVFRCOMPILE\r
+#*_VS2005EXP_IA32_*_FAMILY           = MSFT\r
+#\r
+#*_VS2005EXP_IA32_*_PATH             = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
+#*_VS2005EXP_IA32_*_DPATH            = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
+#*_VS2005EXP_IA32_ASM_PATH           = C:\WINDDK\3790.1830\bin\x86\r
+#*_VS2005EXP_IA32_ASMLINK_PATH       = C:\WINDDK\3790.1830\bin\bin16\r
+*_VS2005EXP_EBC_*_PATH              = C:\Program Files\Intel\EBC\Bin\r
+*_VS2005EXP_IA32_ASL_PATH           = C:\ASL\r
+\r
+#*_VS2005EXP_IA32_CC_NAME            = cl.exe\r
+#*_VS2005EXP_IA32_SLINK_NAME         = lib.exe\r
+#*_VS2005EXP_IA32_DLINK_NAME         = link.exe\r
+#*_VS2005EXP_IA32_ASMLINK_NAME       = link.exe\r
+#*_VS2005EXP_IA32_PP_NAME            = cl.exe\r
+#*_VS2005EXP_IA32_APP_NAME           = cl.exe\r
+#*_VS2005EXP_IA32_VFRPP_NAME         = cl.exe\r
+#*_VS2005EXP_IA32_PCH_NAME           = cl.exe\r
+\r
+#*_VS2005EXP_IA32_SLINK_FLAGS             = /NOLOGO /LTCG\r
+#*_VS2005EXP_IA32_APP_FLAGS               = /nologo /E /TC\r
+#*_VS2005EXP_IA32_PP_FLAGS                = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+#*_VS2005EXP_IA32_VFRPP_FLAGS             = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-#*_VS2005EXP_IA32_ASM_NAME     = ml.exe\r
-#*_VS2005EXP_IA32_ASM_EXT      = .asm\r
-#*_VS2005EXP_IA32_*_PATH       = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
-#*_VS2005EXP_IA32_*_DPATH      = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
-#*_VS2005EXP_IA32_ASM_PATH     = C:\WINDDK\3790.1830\bin\x86\r
-#*_VS2005EXP_IA32_ASMLINK_PATH = C:\WINDDK\3790.1830\bin\bin16\\r
+#*_VS2005EXP_IA32_ASM_NAME           = ml.exe\r
 \r
-#DEBUG_VS2005EXP_IA32_CC_FLAGS      = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h /Zi /Gm\r
-#RELEASE_VS2005EXP_IA32_CC_FLAGS    = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h\r
-#DEBUG_VS2005EXP_IA32_PCH_FLAGS     = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-#RELEASE_VS2005EXP_IA32_PCH_FLAGS   = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC\r
-#DEBUG_VS2005EXP_IA32_ASM_FLAGS     = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi  \r
-#RELEASE_VS2005EXP_IA32_ASM_FLAGS   = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
-#DEBUG_VS2005EXP_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG   \r
-#RELEASE_VS2005EXP_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
-#*_VS2005EXP_IA32_ASMLINK_FLAGS     = /link /nologo /tiny\r
+#DEBUG_VS2005EXP_IA32_CC_FLAGS            = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
+#RELEASE_VS2005EXP_IA32_CC_FLAGS          = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
+#DEBUG_VS2005EXP_IA32_PCH_FLAGS           = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
+#RELEASE_VS2005EXP_IA32_PCH_FLAGS         = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+#DEBUG_VS2005EXP_IA32_ASM_FLAGS           = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
+#RELEASE_VS2005EXP_IA32_ASM_FLAGS         = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
+#DEBUG_VS2005EXP_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+#RELEASE_VS2005EXP_IA32_DLINK_FLAGS       = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+#*_VS2005EXP_IA32_ASMLINK_FLAGS           = /link /nologo /tiny\r
 \r
 ##################\r
 # EBC definitions\r
 ##################\r
-*_VS2005EXP_EBC_*_FAMILY      = INTEL\r
-*_VS2005EXP_EBC_PP_NAME       = iec.exe\r
-*_VS2005EXP_EBC_CC_NAME       = iec.exe\r
-*_VS2005EXP_EBC_DLINK_NAME    = link.exe\r
-*_VS2005EXP_EBC_SLINK_NAME    = link.exe\r
-*_VS2005EXP_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin\r
-*_VS2005EXP_EBC_*_SPATH       = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"\r
+*_VS2005EXP_EBC_*_FAMILY            = INTEL\r
+\r
+*_VS2005EXP_EBC_PP_NAME             = iec.exe\r
+*_VS2005EXP_EBC_CC_NAME             = iec.exe\r
+*_VS2005EXP_EBC_DLINK_NAME          = link.exe\r
+*_VS2005EXP_EBC_SLINK_NAME          = link.exe\r
 \r
-*_VS2005EXP_EBC_PP_FLAGS      = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h \r
-*_VS2005EXP_EBC_CC_FLAGS      = /nologo /c /W3 /WX /FI${DEST_DIR_DEBUG}/AutoGen.h /DSTRING_ARRAY_NAME=${BASE_NAME}Strings \r
-*_VS2005EXP_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC\r
-*_VS2005EXP_EBC_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:${ENTRYPOINT} /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
+*_VS2005EXP_EBC_PP_FLAGS                 = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_VS2005EXP_EBC_CC_FLAGS                 = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_VS2005EXP_EBC_SLINK_FLAGS              = /lib /NOLOGO /MACHINE:EBC\r
+*_VS2005EXP_EBC_DLINK_FLAGS              = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
 \r
 ##################\r
 # ASL definitions\r
 ##################\r
-*_VS2005EXP_IA32_ASL_FAMILY  = INTEL\r
-*_VS2005EXP_IA32_ASL_NAME    = iasl.exe\r
-*_VS2005EXP_IA32_ASL_PATH    = C:\ASL\r
+*_VS2005EXP_IA32_ASL_FAMILY         = INTEL\r
+\r
+*_VS2005EXP_IA32_ASL_NAME           = iasl.exe\r
 \r
 \r
 ####################################################################################\r
 #\r
-# Microsoft Visual Studio 2005 Standard Edition (IA-32 Only, with no Link Time Code Generation) \r
+# Microsoft Visual Studio 2005 Standard Edition (IA-32 Only, with no Link Time Code Generation)\r
 #\r
 # Uncomment this section to use these tools or install in an alternate location\r
 # if more than one version of VS2005 is installed on a single system.\r
 #\r
 ####################################################################################\r
 #   VS2005STD        - Microsoft Visual Studio 2005 Standard Edition\r
-#*_VS2005STD_*_*_FAMILY       = MSFT\r
-\r
-#*_VS2005STD_*_CC_NAME        = cl.exe\r
-#*_VS2005STD_*_SLINK_NAME     = lib.exe\r
-#*_VS2005STD_*_DLINK_NAME     = link.exe\r
-#*_VS2005STD_*_ASMLINK_NAME   = link.exe\r
-#*_VS2005STD_*_PP_NAME        = cl.exe\r
-#*_VS2005STD_*_APP_NAME       = cl.exe\r
-#*_VS2005STD_*_VFRPP_NAME     = cl.exe\r
-#*_VS2005STD_*_PCH_NAME       = cl.exe\r
-\r
-#*_VS2005STD_*_SLINK_FLAGS       = /NOLOGO /LTCG\r
-#*_VS2005STD_*_APP_FLAGS         = /nologo /P /TC\r
-#*_VS2005STD_*_PP_FLAGS          = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h \r
-#*_VS2005STD_*_VFRPP_FLAGS       = /nologo /P /TC /DVFRCOMPILE\r
+#*_VS2005STD_*_*_FAMILY              = MSFT\r
+#*_VS2005STD_IA32_*_PATH             = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
+#*_VS2005STD_IA32_*_DPATH            = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
+#*_VS2005STD_IA32_ASM_PATH           = C:\WINDDK\3790.1830\bin\x86\r
+#*_VS2005STD_IA32_ASMLINK_PATH       = C:\WINDDK\3790.1830\bin\bin16\r
+*_VS2005STD_EBC_*_PATH              = C:\Program Files\Intel\EBC\Bin\r
+*_VS2005STD_*_ASL_PATH              = C:\ASL\r
+\r
+#*_VS2005STD_*_CC_NAME               = cl.exe\r
+#*_VS2005STD_*_SLINK_NAME            = lib.exe\r
+#*_VS2005STD_*_DLINK_NAME            = link.exe\r
+#*_VS2005STD_*_ASMLINK_NAME          = link.exe\r
+#*_VS2005STD_*_PP_NAME               = cl.exe\r
+#*_VS2005STD_*_APP_NAME              = cl.exe\r
+#*_VS2005STD_*_VFRPP_NAME            = cl.exe\r
+#*_VS2005STD_*_PCH_NAME              = cl.exe\r
+\r
+#*_VS2005STD_*_SLINK_FLAGS                = /NOLOGO /LTCG\r
+#*_VS2005STD_*_APP_FLAGS                  = /nologo /E /TC\r
+#*_VS2005STD_*_PP_FLAGS                   = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+#*_VS2005STD_*_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-#*_VS2005STD_IA32_ASM_NAME     = ml.exe\r
-#*_VS2005STD_IA32_ASM_EXT      = .asm\r
-#*_VS2005STD_IA32_*_PATH       = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
-#*_VS2005STD_IA32_*_DPATH      = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
-#*_VS2005STD_IA32_ASM_PATH     = C:\WINDDK\3790.1830\bin\x86\r
-#*_VS2005STD_IA32_ASMLINK_PATH = C:\WINDDK\3790.1830\bin\bin16\\r
+#*_VS2005STD_IA32_ASM_NAME           = ml.exe\r
 \r
-#DEBUG_VS2005STD_IA32_CC_FLAGS      = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h /Zi /Gm\r
-#RELEASE_VS2005STD_IA32_CC_FLAGS    = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h\r
-#DEBUG_VS2005STD_IA32_PCH_FLAGS     = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-#RELEASE_VS2005STD_IA32_PCH_FLAGS   = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC\r
-#DEBUG_VS2005STD_IA32_ASM_FLAGS     = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi  \r
-#RELEASE_VS2005STD_IA32_ASM_FLAGS   = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
-#DEBUG_VS2005STD_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG   \r
-#RELEASE_VS2005STD_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
-#*_VS2005STD_IA32_ASMLINK_FLAGS     = /link /nologo /tiny\r
+#DEBUG_VS2005STD_IA32_CC_FLAGS            = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
+#RELEASE_VS2005STD_IA32_CC_FLAGS          = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
+#DEBUG_VS2005STD_IA32_PCH_FLAGS           = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
+#RELEASE_VS2005STD_IA32_PCH_FLAGS         = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+#DEBUG_VS2005STD_IA32_ASM_FLAGS           = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
+#RELEASE_VS2005STD_IA32_ASM_FLAGS         = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
+#DEBUG_VS2005STD_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+#RELEASE_VS2005STD_IA32_DLINK_FLAGS       = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+#*_VS2005STD_IA32_ASMLINK_FLAGS           = /link /nologo /tiny\r
 \r
 ##################\r
 # EBC definitions\r
 ##################\r
-*_VS2005STD_EBC_*_FAMILY      = INTEL\r
-*_VS2005STD_EBC_PP_NAME       = iec.exe\r
-*_VS2005STD_EBC_CC_NAME       = iec.exe\r
-*_VS2005STD_EBC_DLINK_NAME    = link.exe\r
-*_VS2005STD_EBC_SLINK_NAME    = link.exe\r
-*_VS2005STD_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin\r
-*_VS2005STD_EBC_*_SPATH       = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"\r
+*_VS2005STD_EBC_*_FAMILY            = INTEL\r
 \r
-*_VS2005STD_EBC_PP_FLAGS      = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h \r
-*_VS2005STD_EBC_CC_FLAGS      = /nologo /c /W3 /WX /FI${DEST_DIR_DEBUG}/AutoGen.h /DSTRING_ARRAY_NAME=${BASE_NAME}Strings \r
-*_VS2005STD_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC\r
-*_VS2005STD_EBC_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:${ENTRYPOINT} /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
+*_VS2005STD_EBC_PP_NAME             = iec.exe\r
+*_VS2005STD_EBC_CC_NAME             = iec.exe\r
+*_VS2005STD_EBC_DLINK_NAME          = link.exe\r
+*_VS2005STD_EBC_SLINK_NAME          = link.exe\r
+\r
+*_VS2005STD_EBC_PP_FLAGS                 = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_VS2005STD_EBC_CC_FLAGS                 = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_VS2005STD_EBC_SLINK_FLAGS              = /lib /NOLOGO /MACHINE:EBC\r
+*_VS2005STD_EBC_DLINK_FLAGS              = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
 \r
 ##################\r
 # ASL definitions\r
 ##################\r
-*_VS2005STD_*_ASL_FAMILY  = INTEL\r
-*_VS2005STD_*_ASL_NAME    = iasl.exe\r
-*_VS2005STD_*_ASL_PATH    = C:\ASL\r
+*_VS2005STD_*_ASL_FAMILY            = INTEL\r
+\r
+*_VS2005STD_*_ASL_NAME              = iasl.exe\r
 \r
 \r
 ####################################################################################\r
 #\r
-# Microsoft Visual Studio 2005 Professional Edition (IA-32 and X64 Only, with Link Time Code Generation) \r
+# Microsoft Visual Studio 2005 Professional Edition (IA-32 and X64 Only, with Link Time Code Generation)\r
 #\r
 ####################################################################################\r
-#   VS2005PRO        - Microsoft Visual Studio 2005 Professional Edition \r
-*_VS2005PRO_*_*_FAMILY       = MSFT\r
+#   VS2005PRO        - Microsoft Visual Studio 2005 Professional Edition\r
+*_VS2005PRO_*_*_FAMILY              = MSFT\r
+\r
+*_VS2005PRO_IA32_*_PATH             = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
+*_VS2005PRO_IA32_*_DPATH            = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
+*_VS2005PRO_IA32_ASM_PATH           = C:\WINDDK\3790.1830\bin\x86\r
+*_VS2005PRO_IA32_ASMLINK_PATH       = C:\WINDDK\3790.1830\bin\bin16\r
+*_VS2005PRO_X64_*_PATH              = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_amd64\r
+*_VS2005PRO_X64_*_DPATH             = C:\Program Files\Microsoft Visual Studio 8\VC\bin\x86_amd64;C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
+*_VS2005PRO_X64_ASMLINK_PATH        = C:\WINDDK\3790.1830\bin\bin16\r
+*_VS2005PRO_EBC_*_PATH              = C:\Program Files\Intel\EBC\Bin\r
+*_VS2005PRO_*_ASL_PATH              = C:\ASL\r
 \r
-*_VS2005PRO_*_CC_NAME        = cl.exe\r
-*_VS2005PRO_*_SLINK_NAME     = lib.exe\r
-*_VS2005PRO_*_DLINK_NAME     = link.exe\r
-*_VS2005PRO_*_ASMLINK_NAME   = link.exe\r
-*_VS2005PRO_*_PP_NAME        = cl.exe\r
-*_VS2005PRO_*_APP_NAME       = cl.exe\r
-*_VS2005PRO_*_VFRPP_NAME     = cl.exe\r
-*_VS2005PRO_*_PCH_NAME       = cl.exe\r
+*_VS2005PRO_*_CC_NAME               = cl.exe\r
+*_VS2005PRO_*_SLINK_NAME            = lib.exe\r
+*_VS2005PRO_*_DLINK_NAME            = link.exe\r
+*_VS2005PRO_*_ASMLINK_NAME          = link.exe\r
+*_VS2005PRO_*_PP_NAME               = cl.exe\r
+*_VS2005PRO_*_APP_NAME              = cl.exe\r
+*_VS2005PRO_*_VFRPP_NAME            = cl.exe\r
+*_VS2005PRO_*_PCH_NAME              = cl.exe\r
 \r
-*_VS2005PRO_*_SLINK_FLAGS       = /NOLOGO /LTCG\r
-*_VS2005PRO_*_APP_FLAGS         = /nologo /P /TC\r
-*_VS2005PRO_*_PP_FLAGS          = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h \r
-*_VS2005PRO_*_VFRPP_FLAGS       = /nologo /P /TC /DVFRCOMPILE\r
+*_VS2005PRO_*_SLINK_FLAGS                = /NOLOGO /LTCG\r
+*_VS2005PRO_*_APP_FLAGS                  = /nologo /E /TC\r
+*_VS2005PRO_*_PP_FLAGS                   = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_VS2005PRO_*_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_VS2005PRO_IA32_ASM_NAME     = ml.exe\r
-*_VS2005PRO_IA32_ASM_EXT      = .asm\r
-*_VS2005PRO_IA32_*_PATH       = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
-*_VS2005PRO_IA32_*_DPATH      = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
-*_VS2005PRO_IA32_ASM_PATH     = C:\WINDDK\3790.1830\bin\x86\r
-*_VS2005PRO_IA32_ASMLINK_PATH = C:\WINDDK\3790.1830\bin\bin16\\r
+*_VS2005PRO_IA32_ASM_NAME           = ml.exe\r
 \r
-DEBUG_VS2005PRO_IA32_CC_FLAGS      = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h /Zi /Gm\r
-RELEASE_VS2005PRO_IA32_CC_FLAGS    = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h\r
-DEBUG_VS2005PRO_IA32_PCH_FLAGS     = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-RELEASE_VS2005PRO_IA32_PCH_FLAGS   = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC\r
-DEBUG_VS2005PRO_IA32_ASM_FLAGS     = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi  \r
-RELEASE_VS2005PRO_IA32_ASM_FLAGS   = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
-DEBUG_VS2005PRO_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG   \r
-RELEASE_VS2005PRO_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
-*_VS2005PRO_IA32_ASMLINK_FLAGS     = /link /nologo /tiny\r
+DEBUG_VS2005PRO_IA32_CC_FLAGS            = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
+RELEASE_VS2005PRO_IA32_CC_FLAGS          = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
+DEBUG_VS2005PRO_IA32_PCH_FLAGS           = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
+RELEASE_VS2005PRO_IA32_PCH_FLAGS         = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+DEBUG_VS2005PRO_IA32_ASM_FLAGS           = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
+RELEASE_VS2005PRO_IA32_ASM_FLAGS         = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
+DEBUG_VS2005PRO_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+RELEASE_VS2005PRO_IA32_DLINK_FLAGS       = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+*_VS2005PRO_IA32_ASMLINK_FLAGS           = /link /nologo /tiny\r
 \r
 ##################\r
 # x64 definitions\r
 ##################\r
-*_VS2005PRO_X64_ASM_NAME       = ml64.exe\r
-*_VS2005PRO_X64_ASM_EXT        = .asm\r
-*_VS2005PRO_X64_*_PATH         = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_amd64\r
-*_VS2005PRO_X64_*_DPATH        = C:\Program Files\Microsoft Visual Studio 8\VC\bin\x86_amd64;C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
-*_VS2005PRO_X64_ASMLINK_PATH   = C:\WINDDK\3790.1830\bin\bin16\\r
+*_VS2005PRO_X64_ASM_NAME            = ml64.exe\r
 \r
-DEBUG_VS2005PRO_X64_CC_FLAGS      = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /D EFIX64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h /Zi /Gm\r
-RELEASE_VS2005PRO_X64_CC_FLAGS    = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /D EFIX64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h\r
-DEBUG_VS2005PRO_X64_PCH_FLAGS     = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /D EFIX64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-RELEASE_VS2005PRO_X64_PCH_FLAGS   = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /D EFIX64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC\r
-DEBUG_VS2005PRO_X64_ASM_FLAGS     = /nologo /W3 /WX /c /Cx /Zd /Zi\r
-RELEASE_VS2005PRO_X64_ASM_FLAGS   = /nologo /W3 /WX /c /Cx /Zd\r
-DEBUG_VS2005PRO_X64_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG \r
-RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+DEBUG_VS2005PRO_X64_CC_FLAGS             = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Zi /Gm\r
+RELEASE_VS2005PRO_X64_CC_FLAGS           = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF\r
+DEBUG_VS2005PRO_X64_PCH_FLAGS            = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
+RELEASE_VS2005PRO_X64_PCH_FLAGS          = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+DEBUG_VS2005PRO_X64_ASM_FLAGS            = /nologo /W3 /WX /c /Cx /Zd /Zi\r
+RELEASE_VS2005PRO_X64_ASM_FLAGS          = /nologo /W3 /WX /c /Cx /Zd\r
+DEBUG_VS2005PRO_X64_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+RELEASE_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
 \r
 ##################\r
 # EBC definitions\r
 ##################\r
-*_VS2005PRO_EBC_*_FAMILY    = INTEL\r
-*_VS2005PRO_EBC_PP_NAME     = iec.exe\r
-*_VS2005PRO_EBC_CC_NAME     = iec.exe\r
-*_VS2005PRO_EBC_DLINK_NAME  = link.exe\r
-*_VS2005PRO_EBC_SLINK_NAME  = link.exe\r
-*_VS2005PRO_EBC_*_PATH      = C:\Program Files\Intel\EBC\Bin\r
-*_VS2005PRO_EBC_*_SPATH     = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"\r
+*_VS2005PRO_EBC_*_FAMILY            = INTEL\r
 \r
-*_VS2005PRO_EBC_PP_FLAGS    = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h \r
-*_VS2005PRO_EBC_CC_FLAGS    = /nologo /c /W3 /WX /FI${DEST_DIR_DEBUG}/AutoGen.h /DSTRING_ARRAY_NAME=${BASE_NAME}Strings \r
-*_VS2005PRO_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC\r
-*_VS2005PRO_EBC_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:${ENTRYPOINT} /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
+*_VS2005PRO_EBC_PP_NAME             = iec.exe\r
+*_VS2005PRO_EBC_CC_NAME             = iec.exe\r
+*_VS2005PRO_EBC_DLINK_NAME          = link.exe\r
+*_VS2005PRO_EBC_SLINK_NAME          = link.exe\r
+\r
+*_VS2005PRO_EBC_PP_FLAGS                 = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_VS2005PRO_EBC_CC_FLAGS                 = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_VS2005PRO_EBC_SLINK_FLAGS              = /lib /NOLOGO /MACHINE:EBC\r
+*_VS2005PRO_EBC_DLINK_FLAGS              = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
 \r
 ##################\r
 # ASL definitions\r
 ##################\r
-*_VS2005PRO_*_ASL_FAMILY  = INTEL\r
-*_VS2005PRO_*_ASL_NAME    = iasl.exe\r
-*_VS2005PRO_*_ASL_PATH    = C:\ASL\r
+*_VS2005PRO_*_ASL_FAMILY            = INTEL\r
+\r
+*_VS2005PRO_*_ASL_NAME              = iasl.exe\r
 \r
 \r
 ####################################################################################\r
 #\r
-# Microsoft Visual Studio 2005 Team Suite Edition (IA-32, X64, and Itanium, with Link Time Code Generation) \r
+# Microsoft Visual Studio 2005 Team Suite Edition (IA-32, X64, and Itanium, with Link Time Code Generation)\r
 #\r
 # Uncomment this section to use these tools or install in an alternate location\r
 # if more than one version of VS2005 is installed on a single system.\r
 #\r
 ####################################################################################\r
 #   VS2005TEAMSUITE  - Microsoft Visual Studio 2005 Team Suite Edition\r
-#*_VS2005TEAMSUITE_*_*_FAMILY       = MSFT\r
-\r
-#*_VS2005TEAMSUITE_*_CC_NAME        = cl.exe\r
-#*_VS2005TEAMSUITE_*_SLINK_NAME     = lib.exe\r
-#*_VS2005TEAMSUITE_*_DLINK_NAME     = link.exe\r
-#*_VS2005TEAMSUITE_*_ASMLINK_NAME   = link.exe\r
-#*_VS2005TEAMSUITE_*_PP_NAME        = cl.exe\r
-#*_VS2005TEAMSUITE_*_APP_NAME       = cl.exe\r
-#*_VS2005TEAMSUITE_*_VFRPP_NAME     = cl.exe\r
-#*_VS2005TEAMSUITE_*_PCH_NAME       = cl.exe\r
-\r
-#*_VS2005TEAMSUITE_*_SLINK_FLAGS       = /NOLOGO /LTCG\r
-#*_VS2005TEAMSUITE_*_APP_FLAGS         = /nologo /P /TC\r
-#*_VS2005TEAMSUITE_*_PP_FLAGS          = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h \r
-#*_VS2005TEAMSUITE_*_VFRPP_FLAGS       = /nologo /P /TC /DVFRCOMPILE\r
+#*_VS2005TEAMSUITE_*_*_FAMILY        = MSFT\r
+#*_VS2005TEAMSUITE_IA32_*_PATH       = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
+#*_VS2005TEAMSUITE_IA32_*_DPATH      = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
+#*_VS2005TEAMSUITE_IA32_ASM_PATH     = C:\WINDDK\3790.1830\bin\x86\r
+#*_VS2005TEAMSUITE_IA32_ASMLINK_PATH = C:\WINDDK\3790.1830\bin\bin16\r
+#*_VS2005TEAMSUITE_X64_*_PATH        = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_amd64\r
+#*_VS2005TEAMSUITE_X64_*_DPATH       = C:\Program Files\Microsoft Visual Studio 8\VC\bin\x86_amd64;C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
+#*_VS2005TEAMSUITE_X64_ASMLINK_PATH  = C:\WINDDK\3790.1830\bin\bin16\r
+#*_VS2005TEAMSUITE_IPF_*_PATH        = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
+#*_VS2005TEAMSUITE_IPF_*_DPATH       = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
+*_VS2005TEAMSUITE_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin\r
+*_VS2005TEAMSUITE_*_ASL_PATH        = C:\ASL\r
+\r
+#*_VS2005TEAMSUITE_*_CC_NAME         = cl.exe\r
+#*_VS2005TEAMSUITE_*_SLINK_NAME      = lib.exe\r
+#*_VS2005TEAMSUITE_*_DLINK_NAME      = link.exe\r
+#*_VS2005TEAMSUITE_*_ASMLINK_NAME    = link.exe\r
+#*_VS2005TEAMSUITE_*_PP_NAME         = cl.exe\r
+#*_VS2005TEAMSUITE_*_APP_NAME        = cl.exe\r
+#*_VS2005TEAMSUITE_*_VFRPP_NAME      = cl.exe\r
+#*_VS2005TEAMSUITE_*_PCH_NAME        = cl.exe\r
+\r
+#*_VS2005TEAMSUITE_*_SLINK_FLAGS          = /NOLOGO /LTCG\r
+#*_VS2005TEAMSUITE_*_APP_FLAGS            = /nologo /E /TC\r
+#*_VS2005TEAMSUITE_*_PP_FLAGS             = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+#*_VS2005TEAMSUITE_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
 #*_VS2005TEAMSUITE_IA32_ASM_NAME     = ml.exe\r
-#*_VS2005TEAMSUITE_IA32_ASM_EXT      = .asm\r
-#*_VS2005TEAMSUITE_IA32_*_PATH       = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
-#*_VS2005TEAMSUITE_IA32_*_DPATH      = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
-#*_VS2005TEAMSUITE_IA32_ASM_PATH     = C:\WINDDK\3790.1830\bin\x86\r
-#*_VS2005TEAMSUITE_IA32_ASMLINK_PATH = C:\WINDDK\3790.1830\bin\bin16\\r
 \r
-#DEBUG_VS2005TEAMSUITE_IA32_CC_FLAGS      = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h /Zi /Gm\r
-#RELEASE_VS2005TEAMSUITE_IA32_CC_FLAGS    = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h\r
-#DEBUG_VS2005TEAMSUITE_IA32_PCH_FLAGS     = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-#RELEASE_VS2005TEAMSUITE_IA32_PCH_FLAGS   = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC\r
-#DEBUG_VS2005TEAMSUITE_IA32_ASM_FLAGS     = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi  \r
+#DEBUG_VS2005TEAMSUITE_IA32_CC_FLAGS      = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
+#RELEASE_VS2005TEAMSUITE_IA32_CC_FLAGS    = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
+#DEBUG_VS2005TEAMSUITE_IA32_PCH_FLAGS     = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
+#RELEASE_VS2005TEAMSUITE_IA32_PCH_FLAGS   = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+#DEBUG_VS2005TEAMSUITE_IA32_ASM_FLAGS     = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
 #RELEASE_VS2005TEAMSUITE_IA32_ASM_FLAGS   = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
-#DEBUG_VS2005TEAMSUITE_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG   \r
-#RELEASE_VS2005TEAMSUITE_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+#DEBUG_VS2005TEAMSUITE_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+#RELEASE_VS2005TEAMSUITE_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
 #*_VS2005TEAMSUITE_IA32_ASMLINK_FLAGS     = /link /nologo /tiny\r
 \r
 ##################\r
 # x64 definitions\r
 ##################\r
-#*_VS2005TEAMSUITE_X64_ASM_NAME       = ml64.exe\r
-#*_VS2005TEAMSUITE_X64_ASM_EXT        = .asm\r
-#*_VS2005TEAMSUITE_X64_*_PATH         = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_amd64\r
-#*_VS2005TEAMSUITE_X64_*_DPATH        = C:\Program Files\Microsoft Visual Studio 8\VC\bin\x86_amd64;C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
-#*_VS2005TEAMSUITE_X64_ASMLINK_PATH   = C:\WINDDK\3790.1830\bin\bin16\\r
+#*_VS2005TEAMSUITE_X64_ASM_NAME      = ml64.exe\r
 \r
-#DEBUG_VS2005TEAMSUITE_X64_CC_FLAGS      = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /D EFIX64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h /Zi /Gm\r
-#RELEASE_VS2005TEAMSUITE_X64_CC_FLAGS    = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /D EFIX64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h\r
-#DEBUG_VS2005TEAMSUITE_X64_PCH_FLAGS     = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /D EFIX64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-#RELEASE_VS2005TEAMSUITE_X64_PCH_FLAGS   = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /D EFIX64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC\r
-#DEBUG_VS2005TEAMSUITE_X64_ASM_FLAGS     = /nologo /W3 /WX /c /Cx /Zd /Zi\r
-#RELEASE_VS2005TEAMSUITE_X64_ASM_FLAGS   = /nologo /W3 /WX /c /Cx /Zd\r
-#DEBUG_VS2005TEAMSUITE_X64_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG \r
-#RELEASE_VS2005TEAMSUITE_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+#DEBUG_VS2005TEAMSUITE_X64_CC_FLAGS       = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Zi /Gm\r
+#RELEASE_VS2005TEAMSUITE_X64_CC_FLAGS     = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF\r
+#DEBUG_VS2005TEAMSUITE_X64_PCH_FLAGS      = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
+#RELEASE_VS2005TEAMSUITE_X64_PCH_FLAGS    = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+#DEBUG_VS2005TEAMSUITE_X64_ASM_FLAGS      = /nologo /W3 /WX /c /Cx /Zd /Zi\r
+#RELEASE_VS2005TEAMSUITE_X64_ASM_FLAGS    = /nologo /W3 /WX /c /Cx /Zd\r
+#DEBUG_VS2005TEAMSUITE_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+#RELEASE_VS2005TEAMSUITE_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
 \r
 ##################\r
 # IPF definitions\r
 ##################\r
-#*_VS2005TEAMSUITE_IPF_ASM_NAME          = ias.exe\r
-#*_VS2005TEAMSUITE_IPF_ASM_EXT           = .s\r
-#*_VS2005TEAMSUITE_IPF_*_PATH            = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
-#*_VS2005TEAMSUITE_IPF_*_DPATH           = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
+#*_VS2005TEAMSUITE_IPF_ASM_NAME      = ias.exe\r
 \r
-#*_VS2005TEAMSUITE_IPF_PP_FLAGS          = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h\r
-#DEBUG_VS2005TEAMSUITE_IPF_CC_FLAGS      = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h /Zi\r
-#RELEASE_VS2005TEAMSUITE_IPF_CC_FLAGS    = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h\r
-#DEBUG_VS2005TEAMSUITE_IPF_PCH_FLAGS     = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC /Zi\r
-#RELEASE_VS2005TEAMSUITE_IPF_PCH_FLAGS   = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC\r
-#DEBUG_VS2005TEAMSUITE_IPF_ASM_FLAGS     = -N us -X explicit -M ilp64 -N so -W4 -d debug\r
-#RELEASE_VS2005TEAMSUITE_IPF_ASM_FLAGS   = -N us -X explicit -M ilp64 -N so -W4\r
-#DEBUG_VS2005TEAMSUITE_IPF_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:${ENTRYPOINT} /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:${DEST_DIR_DEBUG}/${BASE_NAME}.map /PDB:${DEST_DIR_DEBUG}/${BASE_NAME}.pdb /DEBUG\r
-#RELEASE_VS2005TEAMSUITE_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:${ENTRYPOINT} /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:${DEST_DIR_DEBUG}/${BASE_NAME}.map /PDB:${DEST_DIR_DEBUG}/${BASE_NAME}.pdb \r
+#*_VS2005TEAMSUITE_IPF_PP_FLAGS           = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+#DEBUG_VS2005TEAMSUITE_IPF_CC_FLAGS       = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi\r
+#RELEASE_VS2005TEAMSUITE_IPF_CC_FLAGS     = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+#DEBUG_VS2005TEAMSUITE_IPF_PCH_FLAGS      = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi\r
+#RELEASE_VS2005TEAMSUITE_IPF_PCH_FLAGS    = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+#DEBUG_VS2005TEAMSUITE_IPF_ASM_FLAGS      = -N us -X explicit -M ilp64 -N so -W4 -d debug\r
+#RELEASE_VS2005TEAMSUITE_IPF_ASM_FLAGS    = -N us -X explicit -M ilp64 -N so -W4\r
+#DEBUG_VS2005TEAMSUITE_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb /DEBUG\r
+#RELEASE_VS2005TEAMSUITE_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
 \r
 ##################\r
 # EBC definitions\r
 ##################\r
-*_VS2005TEAMSUITE_EBC_*_FAMILY    = INTEL\r
-*_VS2005TEAMSUITE_EBC_PP_NAME     = iec.exe\r
-*_VS2005TEAMSUITE_EBC_CC_NAME     = iec.exe\r
-*_VS2005TEAMSUITE_EBC_DLINK_NAME  = link.exe\r
-*_VS2005TEAMSUITE_EBC_SLINK_NAME  = link.exe\r
-*_VS2005TEAMSUITE_EBC_*_PATH      = "C:\Program Files\Intel\EBC\Bin"\r
-*_VS2005TEAMSUITE_EBC_*_SPATH     = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"\r
+*_VS2005TEAMSUITE_EBC_*_FAMILY      = INTEL\r
+\r
+*_VS2005TEAMSUITE_EBC_PP_NAME       = iec.exe\r
+*_VS2005TEAMSUITE_EBC_CC_NAME       = iec.exe\r
+*_VS2005TEAMSUITE_EBC_DLINK_NAME    = link.exe\r
+*_VS2005TEAMSUITE_EBC_SLINK_NAME    = link.exe\r
 \r
-*_VS2005TEAMSUITE_EBC_PP_FLAGS    = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h \r
-*_VS2005TEAMSUITE_EBC_CC_FLAGS    = /nologo /c /W3 /WX /FI${DEST_DIR_DEBUG}/AutoGen.h /DSTRING_ARRAY_NAME=${BASE_NAME}Strings \r
-*_VS2005TEAMSUITE_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC\r
-*_VS2005TEAMSUITE_EBC_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:${ENTRYPOINT} /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
+*_VS2005TEAMSUITE_EBC_PP_FLAGS           = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_VS2005TEAMSUITE_EBC_CC_FLAGS           = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_VS2005TEAMSUITE_EBC_SLINK_FLAGS        = /lib /NOLOGO /MACHINE:EBC\r
+*_VS2005TEAMSUITE_EBC_DLINK_FLAGS        = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
 \r
 ##################\r
 # ASL definitions\r
 ##################\r
-*_VS2005TEAMSUITE_*_ASL_FAMILY  = INTEL\r
-*_VS2005TEAMSUITE_*_ASL_NAME    = iasl.exe\r
-*_VS2005TEAMSUITE_*_ASL_PATH    = C:\ASL\r
+*_VS2005TEAMSUITE_*_ASL_FAMILY      = INTEL\r
+\r
+*_VS2005TEAMSUITE_*_ASL_NAME        = iasl.exe\r
 \r
 \r
 ####################################################################################\r
@@ -533,37 +531,36 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 #\r
 ####################################################################################\r
 #   UINIXGCC         - UINIX GCC\r
+*_UNIXGCC_IA32_*_FAMILY             = GCC\r
 \r
-*_UNIXGCC_IA32_*_FAMILY        = GCC\r
+*_UNIXGCC_IA32_*_PATH               = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
+*_UNIXGCC_X64_*_PATH                = /opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin\r
 \r
-*_UNIXGCC_IA32_*_PATH       = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
-*_UNIXGCC_IA32_CC_NAME      = gcc\r
-*_UNIXGCC_IA32_SLINK_NAME   = ar\r
-*_UNIXGCC_IA32_DLINK_NAME   = ld\r
-*_UNIXGCC_IA32_ASM_NAME     = gcc\r
-*_UNIXGCC_IA32_PP_NAME      = gcc\r
-*_UNIXGCC_IA32_VFRPP_NAME   = gcc\r
-*_UNIXGCC_IA32_CC_FLAGS     = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include ${DEST_DIR_DEBUG}/AutoGen.h\r
+*_UNIXGCC_IA32_CC_NAME              = gcc\r
+*_UNIXGCC_IA32_SLINK_NAME           = ar\r
+*_UNIXGCC_IA32_DLINK_NAME           = ld\r
+*_UNIXGCC_IA32_ASM_NAME             = gcc\r
+*_UNIXGCC_IA32_PP_NAME              = gcc\r
+*_UNIXGCC_IA32_VFRPP_NAME           = gcc\r
+*_UNIXGCC_IA32_CC_FLAGS                  = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include $(DEST_DIR_DEBUG)/AutoGen.h\r
 \r
 ##################\r
 # x64 definitions\r
 ##################\r
-*_UNIXGCC_X64_*_FAMILY        = GCC\r
+*_UNIXGCC_X64_*_FAMILY              = GCC\r
 \r
-*_UNIXGCC_X64_*_PATH        = /opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin\r
-*_UNIXGCC_X64_CC_NAME       = gcc\r
-*_UNIXGCC_X64_SLINK_NAME    = ar\r
-*_UNIXGCC_X64_DLINK_NAME    = ld\r
-*_UNIXGCC_X64_ASM_NAME      = gcc\r
-*_UNIXGCC_X64_PP_NAME       = gcc\r
-*_UNIXGCC_X64_VFRPP_NAME    = gcc\r
-*_UNIXGCC_X64_CC_FLAGS      = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include ${DEST_DIR_DEBUG}/AutoGen.h -D_EFI_P64\r
+*_UNIXGCC_X64_CC_NAME               = gcc\r
+*_UNIXGCC_X64_SLINK_NAME            = ar\r
+*_UNIXGCC_X64_DLINK_NAME            = ld\r
+*_UNIXGCC_X64_ASM_NAME              = gcc\r
+*_UNIXGCC_X64_PP_NAME               = gcc\r
+*_UNIXGCC_X64_VFRPP_NAME            = gcc\r
+*_UNIXGCC_X64_CC_FLAGS                   = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include $(DEST_DIR_DEBUG)/AutoGen.h -D_EFI_P64\r
 \r
-*_UNIXGCC_*_DLINK_FLAGS     = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _${ENTRYPOINT} --file-alignment 0x20 --section-alignment 0x20 \r
-*_UNIXGCC_*_ASM_FLAGS       = -c -imacros ${DEST_DIR_DEBUG}/AutoGen.h -DASM_PFX(name)=_##name\r
-*_UNIXGCC_*_PP_FLAGS        = -E -x assembler-with-cpp -include ${DEST_DIR_DEBUG}/AutoGen.h\r
-*_UNIXGCC_*_VFRPP_FLAGS     = -x c -E -P -DVFRCOMPILE\r
-*_UNIXGCC_*_ASM_EXT         = .S\r
+*_UNIXGCC_*_DLINK_FLAGS                  = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _$(ENTRYPOINT) --file-alignment 0x20 --section-alignment 0x20\r
+*_UNIXGCC_*_ASM_FLAGS                    = -c -imacros $(DEST_DIR_DEBUG)/AutoGen.h\r
+*_UNIXGCC_*_PP_FLAGS                     = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
+*_UNIXGCC_*_VFRPP_FLAGS                  = -x c -E -P -DVFRCOMPILE --include AutoGen.h\r
 \r
 \r
 ####################################################################################\r
@@ -572,35 +569,39 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 #\r
 ####################################################################################\r
 #   CYGWINGCC        - CygWin GCC\r
-*_CYGWINGCC_IA32_*_FAMILY     = GCC\r
+*_CYGWINGCC_IA32_*_FAMILY           = GCC\r
+\r
+*_CYGWINGCC_IA32_*_PATH             = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
+*_CYGWINGCC_X64_*_PATH              = /opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin\r
+*_CYGWINGCC_*_*_DPATH               = /bin\r
+*_CYGWINGCC_*_ASL_PATH              = /cygdrive/c/ASL\r
 \r
-*_CYGWINGCC_IA32_CC_NAME      = gcc\r
-*_CYGWINGCC_IA32_*_PATH       = c:/Cygwin/opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
-*_CYGWINGCC_IA32_SLINK_NAME   = ar\r
-*_CYGWINGCC_IA32_DLINK_NAME   = ld\r
-*_CYGWINGCC_IA32_ASM_NAME     = gcc\r
-*_CYGWINGCC_IA32_PP_NAME      = gcc\r
-*_CYGWINGCC_IA32_VFRPP_NAME   = gcc\r
-*_CYGWINGCC_IA32_CC_FLAGS     = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h\r
+*_CYGWINGCC_IA32_CC_NAME            = gcc\r
+*_CYGWINGCC_IA32_SLINK_NAME         = ar\r
+*_CYGWINGCC_IA32_DLINK_NAME         = ld\r
+*_CYGWINGCC_IA32_ASM_NAME           = gcc\r
+*_CYGWINGCC_IA32_PP_NAME            = gcc\r
+*_CYGWINGCC_IA32_VFRPP_NAME         = gcc\r
+*_CYGWINGCC_IA32_ASL_NAME           = iasl.exe\r
 \r
+*_CYGWINGCC_IA32_CC_FLAGS                = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include $(DEST_DIR_DEBUG)/AutoGen.h\r
 \r
-*_CYGWINGCC_X64_*_FAMILY      = GCC\r
-*_CYGWINGCC_X64_*_PATH        = c:/Cygwin/opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin\r
-*_CYGWINGCC_X64_CC_NAME       = gcc\r
-*_CYGWINGCC_X64_SLINK_NAME    = ar\r
-*_CYGWINGCC_X64_DLINK_NAME    = ld\r
-*_CYGWINGCC_X64_ASM_NAME      = gcc\r
-*_CYGWINGCC_X64_PP_NAME       = gcc\r
-*_CYGWINGCC_X64_VFRPP_NAME    = gcc\r
 \r
-*_CYGWINGCC_X64_CC_FLAGS      = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h -D_EFI_P64\r
-*_CYGWINGCC_*_DLINK_FLAGS     = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _${ENTRYPOINT} --file-alignment 0x20 --section-alignment 0x20 \r
-*_CYGWINGCC_*_ASM_FLAGS       = -c -imacros ${DEST_DIR_DEBUG}/AutoGen.h -DASM_PFX(name)=_##name\r
-*_CYGWINGCC_*_PP_FLAGS        = -E -x assembler-with-cpp -include ${DEST_DIR_DEBUG}/AutoGen.h\r
-*_CYGWINGCC_*_VFRPP_FLAGS     = -x c -E -P -DVFRCOMPILE\r
-*_CYGWINGCC_*_ASM_EXT         = .S\r
+*_CYGWINGCC_X64_*_FAMILY            = GCC\r
+*_CYGWINGCC_X64_CC_NAME             = gcc\r
+*_CYGWINGCC_X64_SLINK_NAME          = ar\r
+*_CYGWINGCC_X64_DLINK_NAME          = ld\r
+*_CYGWINGCC_X64_ASM_NAME            = gcc\r
+*_CYGWINGCC_X64_PP_NAME             = gcc\r
+*_CYGWINGCC_X64_VFRPP_NAME          = gcc\r
+*_CYGWINGCC_X64_ASL_NAME            = iasl.exe\r
+\r
+*_CYGWINGCC_X64_CC_FLAGS                 = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include $(DEST_DIR_DEBUG)/AutoGen.h -D_EFI_P64\r
+*_CYGWINGCC_*_DLINK_FLAGS                = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _$(ENTRYPOINT) --file-alignment 0x20 --section-alignment 0x20\r
+*_CYGWINGCC_*_ASM_FLAGS                  = -c -imacros $(DEST_DIR_DEBUG)/AutoGen.h\r
+*_CYGWINGCC_*_PP_FLAGS                   = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
+*_CYGWINGCC_*_VFRPP_FLAGS                = -x c -E -P -DVFRCOMPILE --include AutoGen.h\r
 \r
-*_CYGWINGCC_*_*_DPATH         = c:/Cygwin/bin\r
 \r
 ####################################################################################\r
 #\r
@@ -609,62 +610,63 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 #\r
 ####################################################################################\r
 #   ELFGCC           - Linux ELF GCC\r
-*_ELFGCC_*_*_FAMILY        = GCC\r
+*_ELFGCC_*_*_FAMILY                 = GCC\r
+*_ELFGCC_IA32_*_PATH                = /usr/bin\r
 \r
-*_ELFGCC_IA32_CC_NAME      = gcc\r
-*_ELFGCC_IA32_SLINK_NAME   = ar\r
-*_ELFGCC_IA32_DLINK_NAME   = ld\r
-*_ELFGCC_IA32_ASM_NAME     = gcc\r
-*_ELFGCC_IA32_PP_NAME      = gcc\r
-*_ELFGCC_IA32_VFRPP_NAME   = gcc\r
+*_ELFGCC_IA32_CC_NAME               = gcc\r
+*_ELFGCC_IA32_SLINK_NAME            = ar\r
+*_ELFGCC_IA32_DLINK_NAME            = ld\r
+*_ELFGCC_IA32_ASM_NAME              = gcc\r
+*_ELFGCC_IA32_PP_NAME               = gcc\r
+*_ELFGCC_IA32_VFRPP_NAME            = gcc\r
 \r
-*_ELFGCC_IA32_CC_FLAGS     = -g -fshort-wchar -fno-strict-aliasing -Wall -malign-double -c -include ${DEST_DIR_DEBUG}/AutoGen.h -DSTRING_ARRAY_NAME=${BASE_NAME}Strings\r
-*_ELFGCC_*_DLINK_FLAGS     = -nostdlib -n -q -Ttext 0x220 --entry ${ENTRYPOINT} -u ${ENTRYPOINT}\r
-*_ELFGCC_*_ASM_FLAGS       = -c -imacros ${DEST_DIR_DEBUG}/AutoGen.h -DASM_PFX(name)=name\r
-*_ELFGCC_*_PP_FLAGS        = -E -x assembler-with-cpp -include ${DEST_DIR_DEBUG}/AutoGen.h\r
-*_ELFGCC_*_VFRPP_FLAGS     = -x c -E -P -DVFRCOMPILE\r
-*_ELFGCC_*_ASM_EXT         = .S\r
+*_ELFGCC_IA32_CC_FLAGS                   = -m32 -g -fshort-wchar -fno-strict-aliasing -Wall -malign-double -c -include $(DEST_DIR_DEBUG)/AutoGen.h -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings\r
+*_ELFGCC_*_DLINK_FLAGS                   = -melf_i386 -nostdlib -n -q -Ttext 0x220 --entry $(ENTRYPOINT) -u $(ENTRYPOINT)\r
+*_ELFGCC_*_ASM_FLAGS                     = -m32 -c -imacros $(DEST_DIR_DEBUG)/AutoGen.h\r
+*_ELFGCC_*_PP_FLAGS                      = -m32 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
+*_ELFGCC_*_VFRPP_FLAGS                   = -x c -E -P -DVFRCOMPILE --include AutoGen.h\r
 \r
-*_ELFGCC_IA32_*_PATH       = /usr/bin\r
 \r
 ####################################################################################\r
 #\r
 # Intel EFI Byte Code Compiler (Template)\r
 #\r
 ####################################################################################\r
-# \r
-# *_*_EBC_*_FAMILY     = INTEL\r
-# *_*_EBC_PP_NAME      = iec.exe\r
-# *_*_EBC_CC_NAME      = iec.exe\r
-# *_*_EBC_SLINK_NAME   = link.exe\r
-# *_*_EBC_*_PATH       = C:\Program Files\Intel\EBC\Bin\r
-# *_*_EBC_*_SPATH      = C:\Program Files\Intel\EBC\Lib\EbcLib.lib\r
-# \r
-# *_*_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC\r
-# *_*_EBC_PP_FLAGS      = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h \r
-# *_*_EBC_CC_FLAGS      = /nologo /FAcs /c /W3 /WX /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h\r
-# *_*_EBC_DLINK_FLAGS   = /NOLOGO /MACHINE:EBC /OPT:REF /NODEFAULTLIB /ENTRY:${ENTRYPOINT} /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
-# \r
+# *_*_EBC_*_FAMILY                   = INTEL\r
+#\r
+# *_*_EBC_*_PATH                     = C:\Program Files\Intel\EBC\Bin\r
+#\r
+# *_*_EBC_PP_NAME                    = iec.exe\r
+# *_*_EBC_CC_NAME                    = iec.exe\r
+# *_*_EBC_SLINK_NAME                 = link.exe\r
+#\r
+# *_*_EBC_SLINK_FLAGS                     = /lib /NOLOGO /MACHINE:EBC\r
+# *_*_EBC_PP_FLAGS                        = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+# *_*_EBC_CC_FLAGS                        = /nologo /FAcs /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+# *_*_EBC_DLINK_FLAGS                     = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /MACHINE:EBC /OPT:REF /NODEFAULTLIB /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
+#\r
 ####################################################################################\r
 #\r
 # Intel ACPI Source Language Compiler (Template)\r
 #\r
 ####################################################################################\r
-# \r
-# *_*_*_ASL_FAMILY  = INTEL\r
-# *_*_*_ASL_NAME    = iasl.exe\r
-# *_*_*_ASL_PATH    = C:\ASL\r
-# \r
+# *_*_*_ASL_FAMILY                   = INTEL\r
+#\r
+# *_*_*_ASL_PATH                     = C:\ASL\r
+#\r
+# *_*_*_ASL_NAME                     = iasl.exe\r
+#\r
 ####################################################################################\r
 #\r
 # Microsoft ACPI Source Language Compiler (Template)\r
 #\r
 ####################################################################################\r
-# \r
-# *_*_*_ASL_FAMILY  = MSFT\r
-# *_*_*_ASL_NAME    = asl.exe\r
-# *_*_*_ASL_PATH    = C:\ASL\r
-# \r
+# *_*_*_ASL_FAMILY                   = MSFT\r
+#\r
+# *_*_*_ASL_PATH                     = C:\ASL\r
+#\r
+# *_*_*_ASL_NAME                     = asl.exe\r
+#\r
 \r
 \r
 ####################################################################################\r
@@ -676,76 +678,77 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 #\r
 ####################################################################################\r
 #   ICC              - Intel C Compiler V9.1\r
-*_ICC_*_*_FAMILY             = MSFT\r
+*_ICC_*_*_FAMILY                    = MSFT\r
+\r
+*_ICC_IA32_*_PATH                   = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
+*_ICC_IA32_*_DPATH                  = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r
+*_ICC_IA32_ASMLINK_PATH             = C:\WINDDK\3790.1830\bin\bin16\r
+*_ICC_IPF_*_PATH                    = C:\Program Files\Intel\Compiler\C++\9.1\Itanium\Bin\r
+DEBUG_ICC_*_ASL_PATH                = C:\ASL\r
+RELEASE_ICC_*_ASL_PATH              = C:\ASL\r
 \r
-*_ICC_*_CC_NAME              = cl.exe\r
-*_ICC_*_SLINK_NAME           = lib.exe\r
-*_ICC_*_DLINK_NAME           = link.exe\r
-*_ICC_*_ASMLINK_NAME         = link.exe\r
-*_ICC_*_PP_NAME              = cl.exe\r
-*_ICC_*_VFRPP_NAME           = cl.exe\r
-*_ICC_*_APP_NAME             = cl.exe\r
-*_ICC_*_ASM_NAME             = ml.exe\r
+*_ICC_*_CC_NAME                     = cl.exe\r
+*_ICC_*_SLINK_NAME                  = lib.exe\r
+*_ICC_*_DLINK_NAME                  = link.exe\r
+*_ICC_*_ASMLINK_NAME                = link.exe\r
+*_ICC_*_PP_NAME                     = cl.exe\r
+*_ICC_*_VFRPP_NAME                  = cl.exe\r
+*_ICC_*_APP_NAME                    = cl.exe\r
+*_ICC_*_ASM_NAME                    = ml.exe\r
 \r
-*_ICC_*_VFRPP_FLAGS            = /nologo /P /TC /DVFRCOMPILE\r
+*_ICC_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_ICC_IA32_*_PATH            = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
-*_ICC_IA32_PCH_NAME          = cl.exe\r
-*_ICC_IA32_ASM_EXT           = .asm\r
-*_ICC_IA32_*_DPATH           = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r
-*_ICC_IA32_ASMLINK_PATH      = C:\WINDDK\3790.1830\bin\bin16\\r
-\r
-*_ICC_IA32_APP_FLAGS         = /nologo /P /TC\r
-*_ICC_IA32_PP_FLAGS          = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h\r
-DEBUG_ICC_IA32_CC_FLAGS      = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h /Zi /Gm\r
-RELEASE_ICC_IA32_CC_FLAGS    = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h\r
-DEBUG_ICC_IA32_PCH_FLAGS     = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-RELEASE_ICC_IA32_PCH_FLAGS   = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC\r
-DEBUG_ICC_IA32_ASM_FLAGS     = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
-RELEASE_ICC_IA32_ASM_FLAGS   = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
-*_ICC_IA32_SLINK_FLAGS       = /nologo /LTCG\r
-DEBUG_ICC_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_ICC_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+*_ICC_IA32_PCH_NAME                 = cl.exe\r
+\r
+*_ICC_IA32_APP_FLAGS                     = /nologo /E /TC\r
+*_ICC_IA32_PP_FLAGS                      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+DEBUG_ICC_IA32_CC_FLAGS                  = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
+RELEASE_ICC_IA32_CC_FLAGS                = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
+DEBUG_ICC_IA32_PCH_FLAGS                 = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Yc /TC /Zi /Gm\r
+RELEASE_ICC_IA32_PCH_FLAGS               = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Yc /TC\r
+DEBUG_ICC_IA32_ASM_FLAGS                 = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
+RELEASE_ICC_IA32_ASM_FLAGS               = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
+*_ICC_IA32_SLINK_FLAGS                   = /nologo /LTCG\r
+DEBUG_ICC_IA32_DLINK_FLAGS               = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+RELEASE_ICC_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
 \r
 ##################\r
 # IPF definitions\r
 ##################\r
-*_ICC_IPF_*_FAMILY  = INTEL\r
-*_ICC_IPF_*_PATH            = C:\Program Files\Intel\Compiler\C++\9.1\Itanium\Bin\r
-\r
-*_ICC_IPF_CC_NAME           = icl.exe\r
-*_ICC_IPF_SLINK_NAME        = xilib.exe\r
-*_ICC_IPF_DLINK_NAME        = xilink.exe\r
-*_ICC_IPF_ASMLINK_NAME      = xilink.exe\r
-*_ICC_IPF_PP_NAME           = icl.exe\r
-*_ICC_IPF_VFRPP_NAME        = icl.exe\r
-\r
-#*_ICC_IPF_PCH_NAME          = icl.exe\r
-*_ICC_IPF_APP_NAME          = icl.exe\r
-*_ICC_IPF_ASM_NAME          = ias.exe\r
-*_ICC_IPF_ASM_EXT           = .s\r
-\r
-*_ICC_IPF_APP_FLAGS         = /nologo /P /TC\r
-*_ICC_IPF_PP_FLAGS          = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h\r
-DEBUG_ICC_IPF_CC_FLAGS      = /nologo /W4 /WX /GX /Gy /c /Os /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h\r
-RELEASE_ICC_IPF_CC_FLAGS    = /nologo /W4 /WX /GX /Gy /c /Os /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h\r
-#DEBUG_ICC_IPF_PCH_FLAGS     = /nologo /W4 /WX /GX /Gy /c /Os /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Yc /TC /Zi\r
-#RELEASE_ICC_IPF_PCH_FLAGS   = /nologo /W4 /WX /GX /Gy /c /Os /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Yc /TC\r
-DEBUG_ICC_IPF_ASM_FLAGS     = -N us -X explicit -M ilp64 -N so -W3 -d debug -F COFF32\r
-RELEASE_ICC_IPF_ASM_FLAGS   = -N us -X explicit -M ilp64 -N so -W3 -F COFF32\r
-DEBUG_ICC_IPF_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:64 /MACHINE:IA64 /ENTRY:${ENTRYPOINT} /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:${DEST_DIR_DEBUG}/${BASE_NAME}.map /PDB:${DEST_DIR_DEBUG}/${BASE_NAME}.pdb /DEBUG\r
-RELEASE_ICC_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:64 /MACHINE:IA64 /ENTRY:${ENTRYPOINT} /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:${DEST_DIR_DEBUG}/${BASE_NAME}.map /PDB:${DEST_DIR_DEBUG}/${BASE_NAME}.pdb\r
-*_ICC_IPF_SLINK_FLAGS       = /nologo /LTCG\r
+*_ICC_IPF_*_FAMILY                  = INTEL\r
+\r
+*_ICC_IPF_CC_NAME                   = icl.exe\r
+*_ICC_IPF_SLINK_NAME                = xilib.exe\r
+*_ICC_IPF_DLINK_NAME                = xilink.exe\r
+*_ICC_IPF_ASMLINK_NAME              = xilink.exe\r
+*_ICC_IPF_PP_NAME                   = icl.exe\r
+*_ICC_IPF_VFRPP_NAME                = icl.exe\r
+\r
+#*_ICC_IPF_PCH_NAME                  = icl.exe\r
+*_ICC_IPF_APP_NAME                  = icl.exe\r
+*_ICC_IPF_ASM_NAME                  = ias.exe\r
+\r
+*_ICC_IPF_APP_FLAGS                      = /nologo /E /TC\r
+*_ICC_IPF_PP_FLAGS                       = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+DEBUG_ICC_IPF_CC_FLAGS                   = /nologo /W4 /WX /GX /Gy /c /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 /Zi\r
+RELEASE_ICC_IPF_CC_FLAGS                 = /nologo /W4 /WX /GX /Gy /c /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 \r
+#DEBUG_ICC_IPF_PCH_FLAGS                  = /nologo /W4 /WX /GX /Gy /c /Os /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC /Zi\r
+#RELEASE_ICC_IPF_PCH_FLAGS                = /nologo /W4 /WX /GX /Gy /c /Os /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC\r
+DEBUG_ICC_IPF_ASM_FLAGS                  = -N us -X explicit -M ilp64 -N so -W3 -d debug -F COFF32\r
+RELEASE_ICC_IPF_ASM_FLAGS                = -N us -X explicit -M ilp64 -N so -W3 -F COFF32\r
+DEBUG_ICC_IPF_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:64 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb /DEBUG\r
+RELEASE_ICC_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:64 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
+*_ICC_IPF_SLINK_FLAGS                    = /nologo /LTCG\r
 \r
 ##################\r
 # ASL definitions\r
 ##################\r
-*_ICC_*_ASL_FAMILY  = INTEL\r
-*_ICC_*_ASL_NAME    = iasl.exe\r
-*_ICC_*_ASL_PATH    = C:\ASL\r
+*_ICC_*_ASL_FAMILY                  = INTEL\r
+\r
+*_ICC_*_ASL_NAME                    = iasl.exe\r
 \r
 ####################################################################################\r
 #\r
@@ -758,104 +761,108 @@ RELEASE_ICC_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGN
 #\r
 ####################################################################################\r
 #   MYTOOLS          - Settings compatible with previous versions of tools_def.template\r
-*_MYTOOLS_*_*_FAMILY             = MSFT\r
-\r
-*_MYTOOLS_*_CC_NAME              = cl.exe  \r
-*_MYTOOLS_*_SLINK_NAME           = lib.exe\r
-*_MYTOOLS_*_DLINK_NAME           = link.exe\r
-*_MYTOOLS_*_ASMLINK_NAME         = link.exe\r
-*_MYTOOLS_*_PP_NAME              = cl.exe \r
-*_MYTOOLS_*_VFRPP_NAME           = cl.exe \r
-*_MYTOOLS_*_APP_NAME             = cl.exe\r
-*_MYTOOLS_*_ASM_NAME             = ml.exe\r
+*_MYTOOLS_*_*_FAMILY                = MSFT\r
+\r
+DEBUG_MYTOOLS_*_TIANO_PATH          = \r
+RELEASE_MYTOOLS_*_TIANO_PATH        = \r
+*_MYTOOLS_IA32_*_PATH               = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
+*_MYTOOLS_IA32_*_DPATH              = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r
+*_MYTOOLS_IA32_ASMLINK_PATH         = C:\WINDDK\3790.1830\bin\bin16\r
+*_MYTOOLS_X64_*_PATH                = C:\WINDDK\3790.1830\bin\win64\x86\amd64\r
+*_MYTOOLS_X64_ASMLINK_PATH          = C:\WINDDK\3790.1830\bin\bin16\r
+*_MYTOOLS_IPF_*_PATH                = C:\WINDDK\3790.1830\bin\win64\x86\r
+*_MYTOOLS_EBC_*_PATH                = C:\Program Files\Intel\EBC\Bin\r
+DEBUG_MYTOOLS_*_ASL_PATH            = C:\ASL\r
+RELEASE_MYTOOLS_*_ASL_PATH          = C:\ASL\r
+\r
+*_MYTOOLS_*_CC_NAME                 = cl.exe\r
+*_MYTOOLS_*_SLINK_NAME              = lib.exe\r
+*_MYTOOLS_*_DLINK_NAME              = link.exe\r
+*_MYTOOLS_*_ASMLINK_NAME            = link.exe\r
+*_MYTOOLS_*_PP_NAME                 = cl.exe\r
+*_MYTOOLS_*_VFRPP_NAME              = cl.exe\r
+*_MYTOOLS_*_APP_NAME                = cl.exe\r
+*_MYTOOLS_*_ASM_NAME                = ml.exe\r
+\r
+*_MYTOOLS_*_VFRPP_FLAGS                  = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+\r
+*_MYTOOLS_*_TIANO_NAME              = TianoCompress.exe\r
+*_MYTOOLS_*_TIANO_GUID                   = A31280AD-481E-41B6-95E8-127F4C984779\r
 \r
-*_MYTOOLS_*_VFRPP_FLAGS          = /nologo /P /TC /DVFRCOMPILE\r
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_MYTOOLS_IA32_PCH_NAME          = cl.exe \r
-*_MYTOOLS_IA32_ASM_EXT           = .asm\r
+*_MYTOOLS_IA32_PCH_NAME             = cl.exe\r
 \r
-*_MYTOOLS_IA32_*_PATH            = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
-*_MYTOOLS_IA32_*_DPATH           = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r
-*_MYTOOLS_IA32_ASMLINK_PATH      = C:\WINDDK\3790.1830\bin\bin16\\r
-\r
-*_MYTOOLS_IA32_APP_FLAGS         = /nologo /P /TC\r
-*_MYTOOLS_IA32_PP_FLAGS          = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h \r
-DEBUG_MYTOOLS_IA32_CC_FLAGS      = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h /Zi /Gm\r
-RELEASE_MYTOOLS_IA32_CC_FLAGS    = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h\r
-DEBUG_MYTOOLS_IA32_PCH_FLAGS     = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /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 /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC\r
-DEBUG_MYTOOLS_IA32_ASM_FLAGS     = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi  \r
-RELEASE_MYTOOLS_IA32_ASM_FLAGS   = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
-*_MYTOOLS_IA32_ASMLINK_FLAGS     = /link /nologo /tiny\r
-*_MYTOOLS_IA32_SLINK_FLAGS       = /nologo /LTCG\r
-DEBUG_MYTOOLS_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG   \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\r
+*_MYTOOLS_IA32_APP_FLAGS                 = /nologo /E /TC\r
+*_MYTOOLS_IA32_PP_FLAGS                  = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+DEBUG_MYTOOLS_IA32_CC_FLAGS              = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
+RELEASE_MYTOOLS_IA32_CC_FLAGS            = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
+DEBUG_MYTOOLS_IA32_PCH_FLAGS             = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
+RELEASE_MYTOOLS_IA32_PCH_FLAGS           = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+DEBUG_MYTOOLS_IA32_ASM_FLAGS             = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
+RELEASE_MYTOOLS_IA32_ASM_FLAGS           = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
+*_MYTOOLS_IA32_ASMLINK_FLAGS             = /link /nologo /tiny\r
+*_MYTOOLS_IA32_SLINK_FLAGS               = /nologo /LTCG\r
+DEBUG_MYTOOLS_IA32_DLINK_FLAGS           = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
+RELEASE_MYTOOLS_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
 \r
 ##################\r
 # x64 definitions\r
 ##################\r
-*_MYTOOLS_X64_PCH_NAME          = cl.exe\r
-*_MYTOOLS_X64_ASM_NAME          = ml64.exe\r
-*_MYTOOLS_X64_ASM_EXT           = .asm\r
-\r
-*_MYTOOLS_X64_*_PATH            = C:\WINDDK\3790.1830\bin\win64\x86\amd64\r
-*_MYTOOLS_X64_ASMLINK_PATH      = C:\WINDDK\3790.1830\bin\bin16\\r
+*_MYTOOLS_X64_PCH_NAME              = cl.exe\r
+*_MYTOOLS_X64_ASM_NAME              = ml64.exe\r
 \r
-*_MYTOOLS_X64_SLINK_FLAGS       = /nologo /LTCG\r
-*_MYTOOLS_X64_APP_FLAGS         = /nologo /P /TC\r
-*_MYTOOLS_X64_PP_FLAGS          = /nologo /P /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 /D EFIX64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${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 /D EFIX64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${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 /D EFIX64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC /Zi /Gm /EHs-c- /GF\r
-RELEASE_MYTOOLS_X64_PCH_FLAGS   = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /D EFIX64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC /EHs-c- /GF\r
-DEBUG_MYTOOLS_X64_ASM_FLAGS     = /nologo /W3 /WX /c /Cx /Zd /Zi\r
-RELEASE_MYTOOLS_X64_ASM_FLAGS   = /nologo /W3 /WX /c /Cx /Zd\r
-DEBUG_MYTOOLS_X64_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG \r
-RELEASE_MYTOOLS_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+*_MYTOOLS_X64_SLINK_FLAGS                = /nologo /LTCG\r
+*_MYTOOLS_X64_APP_FLAGS                  = /nologo /E /TC\r
+*_MYTOOLS_X64_PP_FLAGS                   = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+DEBUG_MYTOOLS_X64_CC_FLAGS               = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF\r
+RELEASE_MYTOOLS_X64_CC_FLAGS             = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF\r
+DEBUG_MYTOOLS_X64_PCH_FLAGS              = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /Zi /Gm /EHs-c- /GF\r
+RELEASE_MYTOOLS_X64_PCH_FLAGS            = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /EHs-c- /GF\r
+DEBUG_MYTOOLS_X64_ASM_FLAGS              = /nologo /W3 /WX /c /Cx /Zd /Zi\r
+RELEASE_MYTOOLS_X64_ASM_FLAGS            = /nologo /W3 /WX /c /Cx /Zd\r
+DEBUG_MYTOOLS_X64_DLINK_FLAGS            = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+RELEASE_MYTOOLS_X64_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
 \r
 ##################\r
 # IPF definitions\r
 ##################\r
-*_MYTOOLS_IPF_PCH_NAME          = cl.exe\r
-*_MYTOOLS_IPF_ASM_NAME          = ias.exe\r
-*_MYTOOLS_IPF_ASM_EXT           = .s\r
+*_MYTOOLS_IPF_PCH_NAME              = cl.exe\r
+*_MYTOOLS_IPF_ASM_NAME              = ias.exe\r
 \r
-*_MYTOOLS_IPF_*_PATH            = C:\WINDDK\3790.1830\bin\win64\x86\r
+*_MYTOOLS_IPF_ASM_OUTPUT                 = "-o "\r
 \r
-*_MYTOOLS_IPF_APP_FLAGS         = /nologo /P /TC\r
-*_MYTOOLS_IPF_PP_FLAGS          = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h\r
-DEBUG_MYTOOLS_IPF_CC_FLAGS      = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h /Zi\r
-RELEASE_MYTOOLS_IPF_CC_FLAGS    = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h\r
-DEBUG_MYTOOLS_IPF_PCH_FLAGS     = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC /Zi\r
-RELEASE_MYTOOLS_IPF_PCH_FLAGS   = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC\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,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_MYTOOLS_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
-*_MYTOOLS_IPF_SLINK_FLAGS       = /nologo /LTCG\r
+*_MYTOOLS_IPF_APP_FLAGS                  = /nologo /E /TC\r
+*_MYTOOLS_IPF_PP_FLAGS                   = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+DEBUG_MYTOOLS_IPF_CC_FLAGS               = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Zx\r
+RELEASE_MYTOOLS_IPF_CC_FLAGS             = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zx\r
+DEBUG_MYTOOLS_IPF_PCH_FLAGS              = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /Zi /Zx\r
+RELEASE_MYTOOLS_IPF_PCH_FLAGS            = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC /Zx\r
+DEBUG_MYTOOLS_IPF_ASM_FLAGS              = -N us -X explicit -M ilp64 -N so -W4 -d debug\r
+RELEASE_MYTOOLS_IPF_ASM_FLAGS            = -N us -X explicit -M ilp64 -N so -W4\r
+DEBUG_MYTOOLS_IPF_DLINK_FLAGS            = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF /OPT:ICF=10 /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb /DEBUG\r
+RELEASE_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF /OPT:ICF=10 /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
+*_MYTOOLS_IPF_SLINK_FLAGS                = /nologo /LTCG\r
 \r
 ##################\r
 # EBC definitions\r
 ##################\r
-*_MYTOOLS_EBC_*_FAMILY      = INTEL\r
-*_MYTOOLS_EBC_PP_NAME       = iec.exe\r
-*_MYTOOLS_EBC_CC_NAME       = iec.exe\r
-*_MYTOOLS_EBC_DLINK_NAME    = link.exe\r
-*_MYTOOLS_EBC_SLINK_NAME    = link.exe\r
+*_MYTOOLS_EBC_*_FAMILY              = INTEL\r
 \r
-*_MYTOOLS_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin\r
-*_MYTOOLS_EBC_*_SPATH       = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"\r
+*_MYTOOLS_EBC_PP_NAME               = iec.exe\r
+*_MYTOOLS_EBC_CC_NAME               = iec.exe\r
+*_MYTOOLS_EBC_DLINK_NAME            = link.exe\r
+*_MYTOOLS_EBC_SLINK_NAME            = link.exe\r
 \r
-*_MYTOOLS_EBC_PP_FLAGS      = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h \r
-*_MYTOOLS_EBC_CC_FLAGS      = /nologo /c /W3 /WX /FI${DEST_DIR_DEBUG}/AutoGen.h /DSTRING_ARRAY_NAME=${BASE_NAME}Strings \r
-*_MYTOOLS_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC\r
-*_MYTOOLS_EBC_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:${ENTRYPOINT} /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
+*_MYTOOLS_EBC_PP_FLAGS                   = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_MYTOOLS_EBC_CC_FLAGS                   = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+*_MYTOOLS_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC\r
+*_MYTOOLS_EBC_DLINK_FLAGS                = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
 \r
 ##################\r
 # ASL definitions\r
 ##################\r
-*_MYTOOLS_*_ASL_FAMILY  = INTEL\r
-*_MYTOOLS_*_ASL_NAME    = iasl.exe\r
-*_MYTOOLS_*_ASL_PATH    = C:\ASL\r
+*_MYTOOLS_*_ASL_FAMILY              = INTEL\r
+\r
+*_MYTOOLS_*_ASL_NAME                = iasl.exe\r