diff options
Diffstat (limited to 'BaseTools/Conf')
| -rw-r--r-- | BaseTools/Conf/build_rule.template | 4 | ||||
| -rw-r--r-- | BaseTools/Conf/tools_def.template | 255 |
2 files changed, 122 insertions, 137 deletions
diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template index 064402c82d..3e3e379d26 100644 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -303,8 +303,8 @@ GenFw -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll
<Command.GCC>
- "$(ASLCC)" /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(ASLCC_FLAGS) $(INC) ${src}
- "$(ASLDLINK)" /OUT:$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
+ "$(ASLCC)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(ASLCC_FLAGS) $(INC) ${src}
+ "$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
GenFw -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll
[Acpi-Table-Code-File]
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index 9d4c2c621e..17cbb630cf 100644 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -13,52 +13,47 @@ IDENTIFIER = Default TOOL_CHAIN_CONF
# common path macros
-DEFINE VSNET_BIN = C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin
-DEFINE VSNET_DLL = C:\Program Files\Microsoft Visual Studio .NET\Common7\IDE
+DEFINE VS2003_BIN = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin
+DEFINE VS2003_DLL = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE
-DEFINE VSNET2003_BIN = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin
-DEFINE VSNET2003_DLL = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE
-
-DEFINE VS2005_BIN = C:\Program Files\Microsoft Visual Studio 8\Vc\bin
-DEFINE VS2005_DLL = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE
-DEFINE VS2005_BINX64 = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_amd64
-DEFINE VS2005_BIN64 = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_ia64
+DEFINE VS2005_BIN = C:\Program Files\Microsoft Visual Studio 8\Vc\bin
+DEFINE VS2005_DLL = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE
+DEFINE VS2005_BINX64 = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_amd64
+DEFINE VS2005_BIN64 = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_ia64
DEFINE VS2005x86_BIN = C:\Program Files (x86)\Microsoft Visual Studio 8\Vc\bin
DEFINE VS2005x86_DLL = C:\Program Files (x86)\Microsoft Visual Studio 8\Common7\IDE
DEFINE VS2005x86_BINX64 = DEF(VS2005x86_BIN)\x86_amd64
DEFINE VS2005x86_BIN64 = DEF(VS2005x86_BIN)\x86_ia64
-DEFINE WINDDK_BIN16 = C:\WINDDK\3790.1830\bin\bin16
-DEFINE WINDDK_BIN32 = C:\WINDDK\3790.1830\bin\x86
-DEFINE WINDDK_BINX64 = C:\WINDDK\3790.1830\bin\win64\x86\amd64
-DEFINE WINDDK_BIN64 = C:\WINDDK\3790.1830\bin\win64\x86
+DEFINE WINDDK_BIN16 = C:\WINDDK\3790.1830\bin\bin16
+DEFINE WINDDK_BIN32 = C:\WINDDK\3790.1830\bin\x86
+DEFINE WINDDK_BINX64 = C:\WINDDK\3790.1830\bin\win64\x86\amd64
+DEFINE WINDDK_BIN64 = C:\WINDDK\3790.1830\bin\win64\x86
# NOTE: The Intel C++ Compiler for Windows requires one of the Microsoft C compiler
# tool chains for the linker and nmake commands.
# This configuration assumes a Windows 2003 Server DDK installation.
-DEFINE ICC_VERSION = 9.1
+DEFINE ICC_VERSION = 9.1
#DEFINE ICC_VERSION = 10.1.021
-DEFINE ICC_BIN32 = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\IA32\Bin
-DEFINE ICC_ASM32 = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\IA32\Bin
-DEFINE ICC_BIN32x86 = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\IA32\Bin
-DEFINE ICC_ASM32x86 = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\IA32\Bin
+DEFINE ICC_BIN32 = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\IA32\Bin
+DEFINE ICC_ASM32 = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\IA32\Bin
+DEFINE ICC_BIN32x86 = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\IA32\Bin
+DEFINE ICC_ASM32x86 = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\IA32\Bin
-DEFINE ICC_BINX64 = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\EM64T\Bin
-DEFINE ICC_ASMX64 = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\EM64T\Bin
-DEFINE ICC_BINX64x86 = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\EM64T\Bin
-DEFINE ICC_ASMX64x86 = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\EM64T\Bin
+DEFINE ICC_BINX64 = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\EM64T\Bin
+DEFINE ICC_ASMX64 = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\EM64T\Bin
+DEFINE ICC_BINX64x86 = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\EM64T\Bin
+DEFINE ICC_ASMX64x86 = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\EM64T\Bin
-DEFINE ICC_BIN64 = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\Itanium\Bin
-DEFINE ICC_BIN64x86 = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\Itanium\Bin
+DEFINE ICC_BIN64 = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\Itanium\Bin
+DEFINE ICC_BIN64x86 = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\Itanium\Bin
-DEFINE EBC_BIN = C:\Program Files\Intel\EBC\Bin
-DEFINE EBC_BINx86 = C:\Program Files (x86)\Intel\EBC\Bin
+DEFINE EBC_BIN = C:\Program Files\Intel\EBC\Bin
+DEFINE EBC_BINx86 = C:\Program Files (x86)\Intel\EBC\Bin
+
+DEFINE ELFGCC_BIN = /usr/bin
-DEFINE ELFGCC_BIN = /usr/bin
-DEFINE UNIX_IASL_BIN = ~/programs/iasl
-DEFINE IASL_FLAGS = -p
-DEFINE MS_ASL_FLAGS = /Fo=
#
# Option 1: Hard coded full path to compiler suite
DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin
@@ -83,14 +78,19 @@ DEFINE UNIXGCC_IPF_PETOOLS_PREFIX = /opt/tiano/ia64-pc-elf/ia64-pc-elf/bin #DEFINE UNIXGCC_X64_PETOOLS_PREFIX = ENV(HOME)/programs/gcc/x64/bin/x86_64-pc-mingw32-
#
-DEFINE CYGWIN_BIN = c:/cygwin/bin
-DEFINE CYGWIN_BIN32 = c:/cygwin/opt/tiano/i386-tiano-pe/i386-tiano-pe/bin
-DEFINE CYGWIN_BINX64 = c:/cygwin/opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin
-DEFINE CYGWIN_BINIPF = c:/cygwin/opt/tiano/gcc/ipf/bin/ia64-pc-elf-
+DEFINE CYGWIN_BIN = c:/cygwin/bin
+DEFINE CYGWIN_BIN32 = c:/cygwin/opt/tiano/i386-tiano-pe/i386-tiano-pe/bin
+DEFINE CYGWIN_BINX64 = c:/cygwin/opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin
+DEFINE CYGWIN_BINIPF = c:/cygwin/opt/tiano/gcc/ipf/bin/ia64-pc-elf-
+
+DEFINE UNIX_IASL_BIN = ~/programs/iasl
+DEFINE WIN_ASL_BIN_DIR = C:\ASL
+DEFINE WIN_IASL_BIN = DEF(WIN_ASL_BIN_DIR)\iasl.exe
+DEFINE WIN_ASL_BIN = DEF(WIN_ASL_BIN_DIR)\asl.exe
+
+DEFINE IASL_FLAGS = -p
+DEFINE MS_ASL_FLAGS = /Fo=
-DEFINE WIN_ASL_BIN_DIR = C:\ASL
-DEFINE WIN_IASL_BIN = DEF(WIN_ASL_BIN_DIR)\iasl.exe
-DEFINE WIN_ASL_BIN = DEF(WIN_ASL_BIN_DIR)\asl.exe
DEFINE MSFT_ASLPP_FLAGS = /nologo /EP /C
DEFINE MSFT_ASLCC_FLAGS = /GL- /Y- /TC /Dmain=ReferenceAcpiTable
DEFINE MSFT_ASLDLINK_FLAGS = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYSTEM:CONSOLE
@@ -127,10 +127,6 @@ DEFINE ICC_WIN_ASLDLINK_FLAGS = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYS # Supported Tool Chains
# =====================
# VS2003 - win32 - Microsoft Visual Studio .NET 2003, Intel EBC, Intel ASL
-# VS2005EXP* - Microsoft Visual Studio 2005 Express Edition
-# VS2005STD* - Microsoft Visual Studio 2005 Standard Edition
-# VS2005PRO - Microsoft Visual Studio 2005 Professional Edition
-# VS2005TEAMSUITE* - Microsoft Visual Studio 2005 Team Suite Edition
# VS2005 - win32 - Microsoft Visual Studio 2005 Team Suite Edition, Intel EBC, Intel ASL (also compatible with VS 2005 Express, Standard, and Pro)
# DDK3790 - win32 - Microsoft Windows DDK 3790.1830, Intel EBC, Intel ASL
# UINIXGCC - UNIX GCC, No EBC, Intel ASL
@@ -143,10 +139,12 @@ DEFINE ICC_WIN_ASLDLINK_FLAGS = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYS # DDK3790xASL - win32 - Microsoft Windows DDK 3790.1830, Intel EBC, Microsoft ASL
# CYGGCCxASL - win32 - CygWin GCC, Intel EBC, Microsoft ASL
# ICCxASL - win32 - Intel C Compiler V9.1, Intel EBC, Microsoft ASL
-# VS2005x86 - win64 - Microsoft Visual Studio 2005 Team Suite Edition, Intel EBC, Intel ASL (also compatible with VS 2005 Express, Standard, and Pro)
-# ICCx86 - win64 - Intel C Compiler V9.1, Intel EBC, Intel ASL
-# VS2005x86xASL - win64 - Microsoft Visual Studio 2005 Team Suite Edition, Intel EBC, Microsoft ASL
-# ICCx86xASL - win64 - Intel C Compiler V9.1, Intel EBC, Microsoft ASL
+# VS2005x86 - win64 - Microsoft Visual Studio 2005 Team Suite Edition (x86), Intel EBC, Intel ASL (also compatible with VS 2005 Express, Standard, and Pro)
+# ICCx86 - win64 - Intel C Compiler V9.1 (x86), Intel EBC, Intel ASL
+# VS2005x86xASL - win64 - Microsoft Visual Studio 2005 Team Suite Edition (x86), Intel EBC, Microsoft ASL (also compatible with VS 2005 Express, Standard, and Pro)
+# ICCx86xASL - win64 - Intel C Compiler V9.1 (x86), Intel EBC, Microsoft ASL
+# CYGGCCx86 - win64 - CygWin GCC (x86), Intel EBC (x86), Intel ASL
+# CYGGCCx86xASL - win64 - CygWin GCC (x86), Intel EBC (x86), Microsoft ASL
# * Commented out - All versions of VS2005 use the same standard install directory
#
####################################################################################
@@ -169,10 +167,10 @@ DEFINE ICC_WIN_ASLDLINK_FLAGS = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYS # *_*_EBC_CC_PATH = C:\Program Files\Intel\EBC\Bin\iec.exe
# *_*_EBC_SLINK_PATH = C:\Program Files\Intel\EBC\Bin\link.exe
#
-# *_*_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC
-# *_*_EBC_PP_FLAGS = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h
-# *_*_EBC_CC_FLAGS = /nologo /FAcs /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h
-# *_*_EBC_DLINK_FLAGS = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /MACHINE:EBC /OPT:REF /NODEFAULTLIB /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER
+# *_*_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC
+# *_*_EBC_PP_FLAGS = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h
+# *_*_EBC_CC_FLAGS = /nologo /FAcs /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h
+# *_*_EBC_DLINK_FLAGS = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /MACHINE:EBC /OPT:REF /NODEFAULTLIB /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER
#
####################################################################################
#
@@ -207,29 +205,29 @@ DEFINE ICC_WIN_ASLDLINK_FLAGS = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYS ##################
# ASL definitions
##################
-*_VS2003_*_ASL_PATH = DEF(WIN_IASL_BIN)
-*_VS2003_*_ASL_FLAGS = DEF(IASL_FLAGS)
-*_VS2003_*_ASLCC_FLAGS = DEF(MSFT_ASLCC_FLAGS)
-*_VS2003_*_ASLPP_FLAGS = DEF(MSFT_ASLPP_FLAGS)
-*_VS2003_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS)
+*_VS2003_*_ASL_PATH = DEF(WIN_IASL_BIN)
+*_VS2003_*_ASL_FLAGS = DEF(IASL_FLAGS)
+*_VS2003_*_ASLCC_FLAGS = DEF(MSFT_ASLCC_FLAGS)
+*_VS2003_*_ASLPP_FLAGS = DEF(MSFT_ASLPP_FLAGS)
+*_VS2003_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS)
##################
# IA32 definitions
##################
-*_VS2003_IA32_*_DLL = DEF(VSNET2003_DLL)
+*_VS2003_IA32_*_DLL = DEF(VS2003_DLL)
-*_VS2003_IA32_MAKE_PATH = DEF(VSNET2003_BIN)\nmake.exe
-*_VS2003_IA32_CC_PATH = DEF(VSNET2003_BIN)\cl.exe
-*_VS2003_IA32_VFRPP_PATH = DEF(VSNET2003_BIN)\cl.exe
-*_VS2003_IA32_SLINK_PATH = DEF(VSNET2003_BIN)\lib.exe
-*_VS2003_IA32_DLINK_PATH = DEF(VSNET2003_BIN)\link.exe
+*_VS2003_IA32_MAKE_PATH = DEF(VS2003_BIN)\nmake.exe
+*_VS2003_IA32_CC_PATH = DEF(VS2003_BIN)\cl.exe
+*_VS2003_IA32_VFRPP_PATH = DEF(VS2003_BIN)\cl.exe
+*_VS2003_IA32_SLINK_PATH = DEF(VS2003_BIN)\lib.exe
+*_VS2003_IA32_DLINK_PATH = DEF(VS2003_BIN)\link.exe
*_VS2003_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe
-*_VS2003_IA32_APP_PATH = DEF(VSNET2003_BIN)\cl.exe
-*_VS2003_IA32_PP_PATH = DEF(VSNET2003_BIN)\cl.exe
-*_VS2003_IA32_ASM_PATH = DEF(VSNET2003_BIN)\ml.exe
-*_VS2003_IA32_ASLCC_PATH = DEF(VSNET2003_BIN)\cl.exe
-*_VS2003_IA32_ASLPP_PATH = DEF(VSNET2003_BIN)\cl.exe
-*_VS2003_IA32_ASLDLINK_PATH = DEF(VSNET2003_BIN)\link.exe
+*_VS2003_IA32_APP_PATH = DEF(VS2003_BIN)\cl.exe
+*_VS2003_IA32_PP_PATH = DEF(VS2003_BIN)\cl.exe
+*_VS2003_IA32_ASM_PATH = DEF(VS2003_BIN)\ml.exe
+*_VS2003_IA32_ASLCC_PATH = DEF(VS2003_BIN)\cl.exe
+*_VS2003_IA32_ASLPP_PATH = DEF(VS2003_BIN)\cl.exe
+*_VS2003_IA32_ASLDLINK_PATH = DEF(VS2003_BIN)\link.exe
*_VS2003_IA32_MAKE_FLAGS = /nologo
@@ -250,7 +248,7 @@ RELEASE_VS2003_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:RE ##################
*_VS2003_EBC_*_FAMILY = INTEL
-*_VS2003_EBC_MAKE_PATH = DEF(VSNET2003_BIN)\nmake.exe
+*_VS2003_EBC_MAKE_PATH = DEF(VS2003_BIN)\nmake.exe
*_VS2003_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe
*_VS2003_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe
*_VS2003_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe
@@ -275,29 +273,29 @@ RELEASE_VS2003_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:RE ##################
# ASL definitions
##################
-*_VS2003xASL_*_ASL_PATH = DEF(WIN_ASL_BIN)
-*_VS2003xASL_*_ASL_FLAGS = DEF(MS_ASL_FLAGS)
-*_VS2003xASL_*_ASLCC_FLAGS = DEF(MSFT_ASLCC_FLAGS)
-*_VS2003xASL_*_ASLPP_FLAGS = DEF(MSFT_ASLPP_FLAGS)
-*_VS2003xASL_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS)
+*_VS2003xASL_*_ASL_PATH = DEF(WIN_ASL_BIN)
+*_VS2003xASL_*_ASL_FLAGS = DEF(MS_ASL_FLAGS)
+*_VS2003xASL_*_ASLCC_FLAGS = DEF(MSFT_ASLCC_FLAGS)
+*_VS2003xASL_*_ASLPP_FLAGS = DEF(MSFT_ASLPP_FLAGS)
+*_VS2003xASL_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS)
##################
# IA32 definitions
##################
-*_VS2003xASL_IA32_*_DLL = DEF(VSNET2003_DLL)
+*_VS2003xASL_IA32_*_DLL = DEF(VS2003_DLL)
-*_VS2003xASL_IA32_MAKE_PATH = DEF(VSNET2003_BIN)\nmake.exe
-*_VS2003xASL_IA32_CC_PATH = DEF(VSNET2003_BIN)\cl.exe
-*_VS2003xASL_IA32_VFRPP_PATH = DEF(VSNET2003_BIN)\cl.exe
-*_VS2003xASL_IA32_SLINK_PATH = DEF(VSNET2003_BIN)\lib.exe
-*_VS2003xASL_IA32_DLINK_PATH = DEF(VSNET2003_BIN)\link.exe
+*_VS2003xASL_IA32_MAKE_PATH = DEF(VS2003_BIN)\nmake.exe
+*_VS2003xASL_IA32_CC_PATH = DEF(VS2003_BIN)\cl.exe
+*_VS2003xASL_IA32_VFRPP_PATH = DEF(VS2003_BIN)\cl.exe
+*_VS2003xASL_IA32_SLINK_PATH = DEF(VS2003_BIN)\lib.exe
+*_VS2003xASL_IA32_DLINK_PATH = DEF(VS2003_BIN)\link.exe
*_VS2003xASL_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe
-*_VS2003xASL_IA32_APP_PATH = DEF(VSNET2003_BIN)\cl.exe
-*_VS2003xASL_IA32_PP_PATH = DEF(VSNET2003_BIN)\cl.exe
-*_VS2003xASL_IA32_ASM_PATH = DEF(VSNET2003_BIN)\ml.exe
-*_VS2003xASL_IA32_ASLCC_PATH = DEF(VSNET2003_BIN)\cl.exe
-*_VS2003xASL_IA32_ASLPP_PATH = DEF(VSNET2003_BIN)\cl.exe
-*_VS2003xASL_IA32_ASLDLINK_PATH = DEF(VSNET2003_BIN)\link.exe
+*_VS2003xASL_IA32_APP_PATH = DEF(VS2003_BIN)\cl.exe
+*_VS2003xASL_IA32_PP_PATH = DEF(VS2003_BIN)\cl.exe
+*_VS2003xASL_IA32_ASM_PATH = DEF(VS2003_BIN)\ml.exe
+*_VS2003xASL_IA32_ASLCC_PATH = DEF(VS2003_BIN)\cl.exe
+*_VS2003xASL_IA32_ASLPP_PATH = DEF(VS2003_BIN)\cl.exe
+*_VS2003xASL_IA32_ASLDLINK_PATH = DEF(VS2003_BIN)\link.exe
*_VS2003xASL_IA32_MAKE_FLAGS = /nologo
@@ -318,7 +316,7 @@ RELEASE_VS2003xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OP ##################
*_VS2003xASL_EBC_*_FAMILY = INTEL
-*_VS2003xASL_EBC_MAKE_PATH = DEF(VSNET2003_BIN)\nmake.exe
+*_VS2003xASL_EBC_MAKE_PATH = DEF(VS2003_BIN)\nmake.exe
*_VS2003xASL_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe
*_VS2003xASL_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe
*_VS2003xASL_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe
@@ -340,51 +338,51 @@ RELEASE_VS2003xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OP # ASL - Intel ACPI Source Language Compiler
####################################################################################
# VS2005 - Microsoft Visual Studio 2005 ALL Edition, including Standard, Professional, Express, TeamSuite
-*_VS2005_*_*_FAMILY = MSFT
+*_VS2005_*_*_FAMILY = MSFT
-*_VS2005_*_MAKE_PATH = DEF(VS2005_BIN)\nmake.exe
-*_VS2005_*_MAKE_FLAGS = /nologo
+*_VS2005_*_MAKE_PATH = DEF(VS2005_BIN)\nmake.exe
+*_VS2005_*_MAKE_FLAGS = /nologo
-*_VS2005_*_SLINK_FLAGS = /NOLOGO /LTCG
-*_VS2005_*_APP_FLAGS = /nologo /E /TC
-*_VS2005_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
-*_VS2005_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2005_*_SLINK_FLAGS = /NOLOGO /LTCG
+*_VS2005_*_APP_FLAGS = /nologo /E /TC
+*_VS2005_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
+*_VS2005_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
##################
# ASL definitions
##################
-*_VS2005_*_ASL_PATH = DEF(WIN_IASL_BIN)
-*_VS2005_*_ASL_FLAGS = DEF(IASL_FLAGS)
-*_VS2005_*_ASLCC_FLAGS = DEF(MSFT_ASLCC_FLAGS)
-*_VS2005_*_ASLPP_FLAGS = DEF(MSFT_ASLPP_FLAGS)
-*_VS2005_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS)
+*_VS2005_*_ASL_PATH = DEF(WIN_IASL_BIN)
+*_VS2005_*_ASL_FLAGS = DEF(IASL_FLAGS)
+*_VS2005_*_ASLCC_FLAGS = DEF(MSFT_ASLCC_FLAGS)
+*_VS2005_*_ASLPP_FLAGS = DEF(MSFT_ASLPP_FLAGS)
+*_VS2005_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS)
##################
# IA32 definitions
##################
-*_VS2005_IA32_*_DLL = DEF(VS2005_DLL)
-
-*_VS2005_IA32_MAKE_PATH = DEF(VS2005_BIN)\nmake.exe
-*_VS2005_IA32_CC_PATH = DEF(VS2005_BIN)\cl.exe
-*_VS2005_IA32_VFRPP_PATH = DEF(VS2005_BIN)\cl.exe
-*_VS2005_IA32_SLINK_PATH = DEF(VS2005_BIN)\lib.exe
-*_VS2005_IA32_DLINK_PATH = DEF(VS2005_BIN)\link.exe
-*_VS2005_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe
-*_VS2005_IA32_APP_PATH = DEF(VS2005_BIN)\cl.exe
-*_VS2005_IA32_PP_PATH = DEF(VS2005_BIN)\cl.exe
-*_VS2005_IA32_ASM_PATH = DEF(VS2005_BIN)\ml.exe
-*_VS2005_IA32_ASLCC_PATH = DEF(VS2005_BIN)\cl.exe
-*_VS2005_IA32_ASLPP_PATH = DEF(VS2005_BIN)\cl.exe
-*_VS2005_IA32_ASLDLINK_PATH = DEF(VS2005_BIN)\link.exe
-
- *_VS2005_IA32_MAKE_FLAGS = /nologo
- DEBUG_VS2005_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm
-RELEASE_VS2005_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF
- DEBUG_VS2005_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
-RELEASE_VS2005_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd
- DEBUG_VS2005_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-RELEASE_VS2005_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text
- *_VS2005_IA32_ASMLINK_FLAGS= /nologo /tiny
+*_VS2005_IA32_*_DLL = DEF(VS2005_DLL)
+
+*_VS2005_IA32_MAKE_PATH = DEF(VS2005_BIN)\nmake.exe
+*_VS2005_IA32_CC_PATH = DEF(VS2005_BIN)\cl.exe
+*_VS2005_IA32_VFRPP_PATH = DEF(VS2005_BIN)\cl.exe
+*_VS2005_IA32_SLINK_PATH = DEF(VS2005_BIN)\lib.exe
+*_VS2005_IA32_DLINK_PATH = DEF(VS2005_BIN)\link.exe
+*_VS2005_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe
+*_VS2005_IA32_APP_PATH = DEF(VS2005_BIN)\cl.exe
+*_VS2005_IA32_PP_PATH = DEF(VS2005_BIN)\cl.exe
+*_VS2005_IA32_ASM_PATH = DEF(VS2005_BIN)\ml.exe
+*_VS2005_IA32_ASLCC_PATH = DEF(VS2005_BIN)\cl.exe
+*_VS2005_IA32_ASLPP_PATH = DEF(VS2005_BIN)\cl.exe
+*_VS2005_IA32_ASLDLINK_PATH = DEF(VS2005_BIN)\link.exe
+
+ *_VS2005_IA32_MAKE_FLAGS = /nologo
+ DEBUG_VS2005_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm
+RELEASE_VS2005_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF
+ DEBUG_VS2005_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
+RELEASE_VS2005_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd
+ DEBUG_VS2005_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+RELEASE_VS2005_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text
+ *_VS2005_IA32_ASMLINK_FLAGS = /nologo /tiny
##################
# X64 definitions
@@ -1137,7 +1135,7 @@ DEFINE UNIXGCC_DLINK_FLAGS_COMMON = -nostdlib -s --pie *_CYGGCC_*_*_FAMILY = GCC
*_CYGGCC_*_*_DLL = DEF(CYGWIN_BIN)
-*_CYGGCC_*_MAKE_PATH = DEF(VSNET2003_BIN)\nmake.exe
+*_CYGGCC_*_MAKE_PATH = DEF(VS2003_BIN)\nmake.exe
*_CYGGCC_*_MAKE_FLAGS = /nologo
*_CYGGCC_*_PP_FLAGS = -E -x assembler-with-cpp -include AutoGen.h
@@ -1232,7 +1230,7 @@ DEFINE UNIXGCC_DLINK_FLAGS_COMMON = -nostdlib -s --pie *_CYGGCCxASL_*_*_FAMILY = GCC
*_CYGGCCxASL_*_*_DLL = DEF(CYGWIN_BIN)
-*_CYGGCCxASL_*_MAKE_PATH = DEF(VSNET2003_BIN)\nmake.exe
+*_CYGGCCxASL_*_MAKE_PATH = DEF(VS2003_BIN)\nmake.exe
*_CYGGCCxASL_*_MAKE_FLAGS = /nologo
*_CYGGCCxASL_*_PP_FLAGS = -E -x assembler-with-cpp -include AutoGen.h
@@ -2044,16 +2042,3 @@ RELEASE_MYTOOLS_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT *_*_*_TIANO_PATH = TianoCompress
*_*_*_TIANO_GUID = A31280AD-481E-41B6-95E8-127F4C984779
-##################
-# Lzma compress tool definitions
-##################
-DEFINE LZMA_BIN = ENV(WORKSPACE)\IntelRestrictedTools\Bin\Win32
-*_*_*_LZMA_PATH = DEF(LZMA_BIN)\LzmaCompress.exe
-*_*_*_LZMA_GUID = EE4E5898-3914-4259-9D6E-DC7BD79403CF
-
-##################
-# ASL tool definitions
-##################
-DEFINE ASL_BIN = ENV(WORKSPACE)\IntelRestrictedTools\Bin\Win32
-*_*_*_ASL_PATH = DEF(ASL_BIN)\iasl.exe
-
|