Menu
▾
▴
SF.net SVN: edk2-buildtools:[2098] trunk/BaseTools/Conf/tools_def.template
|
From: <eri...@us...> - 2010-11-30 03:14:35
|
Revision: 2098
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2098&view=rev
Author: erictian
Date: 2010-11-30 03:14:28 +0000 (Tue, 30 Nov 2010)
Log Message:
-----------
roll back ICC9.1 dependency change. now it still depends on VS 2005
Modified Paths:
--------------
trunk/BaseTools/Conf/tools_def.template
Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template 2010-11-30 00:26:20 UTC (rev 2097)
+++ trunk/BaseTools/Conf/tools_def.template 2010-11-30 03:14:28 UTC (rev 2098)
@@ -45,16 +45,11 @@
# are used by other toolchains. An example is that ICC on Windows normally
# uses Microsoft's nmake.exe.
-# Some MS_VS_BIN options: DEF(VS2003_BIN), DEF(VS2005_BIN), DEF(VS2008_BIN)
-DEFINE MS_VS_BIN = DEF(VS2008_BIN)
-# Some MS_VS_DLL options: DEF(VS2003_DLL), DEF(VS2005_DLL), DEF(VS2008_DLL)
-DEFINE MS_VS_DLL = DEF(VS2008_DLL)
+# Some MS_VS_BIN options: DEF(VS2003_BIN), DEF(VS2005_BIN), DEF(VS2005x86_BIN)
+DEFINE MS_VS_BIN = DEF(VS2005_BIN)
+# Some MS_VS_DLL options: DEF(VS2003_DLL), DEF(VS2005_DLL), DEF(VS2005x86_DLL)
+DEFINE MS_VS_DLL = DEF(VS2005_DLL)
-# Some MS_VSx86_BIN options: DEF(VS2005x86_BIN), DEF(VS2008x86_BIN)
-DEFINE MS_VSx86_BIN = DEF(VS2008x86_BIN)
-# Some MS_VSx86_DLL options: DEF(VS2005x86_DLL), DEF(VS2008x86_DLL)
-DEFINE MS_VSx86_DLL = DEF(VS2008x86_DLL)
-
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
@@ -205,27 +200,27 @@
# UNIXGCC - UNIX GCC, No EBC, Intel ASL
# GCC44 - Linux - GCC 4.4 (Native), No EBC, Intel ASL
# ELFGCC - Linux ELF GCC, No EBC, Intel ASL
-# CYGGCC - win32 - CygWin GCC, Intel EBC, Intel ASL
-# ICC - win32 - Intel C Compiler V9.1, Intel EBC, Intel ASL
-# ICC11 - win32 - Intel C Compiler V11.1, Intel EBC, Intel ASL
+# CYGGCC - win32 - CygWin GCC, Intel EBC, Intel ASL, (depend on VS 2005)
+# ICC - win32 - Intel C Compiler V9.1, Intel EBC, Intel ASL (depend on VS 2005)
+# ICC11 - win32 - Intel C Compiler V11.1, Intel EBC, Intel ASL (depend on VS 2005)
# MYTOOLS - win32 - VS2008 for IA32/X64, WINDDK 3790.1830 for IPF, Intel EBC, Intel ASL
# VS2003xASL - win32 - Microsoft Visual Studio .NET 2003, Intel EBC, Microsoft ASL
# VS2005xASL - win32 - Microsoft Visual Studio 2005 Team Suite Edition, Intel EBC, Microsoft ASL
# VS2008xASL - win32 - Microsoft Visual Studio 2008 Team Suite with Microsoft ASL
# 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
-# ICC11xASL - win32 - Intel C Compiler V11.1, Intel EBC, Microsoft ASL
+# ICCxASL - win32 - Intel C Compiler V9.1, Intel EBC, Microsoft ASL (depend on VS 2005)
+# ICC11xASL - win32 - Intel C Compiler V11.1, Intel EBC, Microsoft ASL (depend on VS 2005)
# VS2005x86 - win64 - Microsoft Visual Studio 2005 Team Suite Edition (x86), Intel EBC, Intel ASL (also compatible with VS 2005 Express, Standard, and Pro)
# VS2008x86 - win64 - Microsoft Visual Studio 2008 (x86) w/ Intel ASL
-# ICCx86 - win64 - Intel C Compiler V9.1 (x86), Intel EBC, Intel ASL
-# ICC11x86 - win64 - Intel C Compiler V11.1 (x86), Intel EBC, Intel ASL
+# ICCx86 - win64 - Intel C Compiler V9.1 (x86), Intel EBC, Intel ASL (depend on VS 2005)
+# ICC11x86 - win64 - Intel C Compiler V11.1 (x86), Intel EBC, Intel ASL (depend on VS 2005)
# VS2005x86xASL - win64 - Microsoft Visual Studio 2005 Team Suite Edition (x86), Intel EBC, Microsoft ASL (also compatible with VS 2005 Express, Standard, and Pro)
# VS2008x86xASL - win64 - Microsoft Visual Studio 2008 (x86) w/ Microsoft ASL
-# ICCx86xASL - win64 - Intel C Compiler V9.1 (x86), Intel EBC, Microsoft ASL
-# ICC11x86xASL - win64 - Intel C Compiler V11.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
+# ICCx86xASL - win64 - Intel C Compiler V9.1 (x86), Intel EBC, Microsoft ASL (depend on VS 2005)
+# ICC11x86xASL - win64 - Intel C Compiler V11.1 (x86), Intel EBC, Microsoft ASL (depend on VS 2005)
+# CYGGCCx86 - win64 - CygWin GCC (x86), Intel EBC (x86), Intel ASL (depend on VS 2005)
+# CYGGCCx86xASL - win64 - CygWin GCC (x86), Intel EBC (x86), Microsoft ASL (depend on VS 2005)
# * Commented out - All versions of VS2005 use the same standard install directory
#
####################################################################################
@@ -1248,26 +1243,7 @@
DEBUG_VS2008x86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG
RELEASE_VS2008x86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb
-##################
-# EBC definitions
-##################
-*_VS2008x86_EBC_*_FAMILY = INTEL
-*_VS2008x86_EBC_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe
-*_VS2008x86_EBC_PP_PATH = DEF(EBC_BINx86)\iec.exe
-*_VS2008x86_EBC_VFRPP_PATH = DEF(EBC_BINx86)\iec.exe
-*_VS2008x86_EBC_CC_PATH = DEF(EBC_BINx86)\iec.exe
-*_VS2008x86_EBC_SLINK_PATH = DEF(EBC_BINx86)\link.exe
-*_VS2008x86_EBC_DLINK_PATH = DEF(EBC_BINx86)\link.exe
-
-*_VS2008x86_EBC_MAKE_FLAGS = /nologo
-*_VS2008x86_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
-*_VS2008x86_EBC_CC_FLAGS = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2008x86_EBC_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
-*_VS2008x86_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC
-*_VS2008x86_EBC_DLINK_FLAGS = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP
-
-
####################################################################################
# VS2008x86xASL - Microsoft Visual Studio 2008 with Microsoft ASL
# ASL - Microsoft ACPI Source Language Compiler (asl.exe)
@@ -1367,25 +1343,7 @@
DEBUG_VS2008x86xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG
RELEASE_VS2008x86xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb
-##################
-# EBC definitions
-##################
-*_VS2008x86xASL_EBC_*_FAMILY = INTEL
-*_VS2008x86xASL_EBC_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe
-*_VS2008x86xASL_EBC_PP_PATH = DEF(EBC_BINx86)\iec.exe
-*_VS2008x86xASL_EBC_VFRPP_PATH = DEF(EBC_BINx86)\iec.exe
-*_VS2008x86xASL_EBC_CC_PATH = DEF(EBC_BINx86)\iec.exe
-*_VS2008x86xASL_EBC_SLINK_PATH = DEF(EBC_BINx86)\link.exe
-*_VS2008x86xASL_EBC_DLINK_PATH = DEF(EBC_BINx86)\link.exe
-
-*_VS2008x86_EBC_MAKE_FLAGS = /nologo
-*_VS2008x86_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
-*_VS2008x86_EBC_CC_FLAGS = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_VS2008x86_EBC_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
-*_VS2008x86_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC
-*_VS2008x86_EBC_DLINK_FLAGS = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP
-
####################################################################################
#
# Microsoft Device Driver Kit 3790.1830 (IA-32, X64, Itanium, with Link Time Code Generation)
@@ -1874,7 +1832,7 @@
*_CYGGCC_*_*_FAMILY = GCC
*_CYGGCC_*_*_DLL = DEF(CYGWIN_BIN)
-*_CYGGCC_*_MAKE_PATH = DEF(MS_VS_BIN)\nmake.exe
+*_CYGGCC_*_MAKE_PATH = DEF(VS2005_BIN)\nmake.exe
*_CYGGCC_*_ASL_PATH = DEF(DEFAULT_WIN_ASL_BIN)
*_CYGGCC_IA32_DLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_FLAGS) --image-base=0
@@ -1963,7 +1921,7 @@
*_CYGGCC_EBC_DLINK_PATH = DEF(EBC_BIN)\link.exe
*_CYGGCC_EBC_SLINK_PATH = DEF(EBC_BIN)\link.exe
*_CYGGCC_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe
-*_CYGGCC_EBC_RC_PATH = DEF(MS_VS_BIN)\rc.exe
+*_CYGGCC_EBC_RC_PATH = DEF(VS2005_BIN)\rc.exe
*_CYGGCC_EBC_CC_FLAGS = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
*_CYGGCC_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC
@@ -1979,7 +1937,7 @@
*_CYGGCCxASL_*_*_FAMILY = GCC
*_CYGGCCxASL_*_*_DLL = DEF(CYGWIN_BIN)
-*_CYGGCCxASL_*_MAKE_PATH = DEF(MS_VS_BIN)\nmake.exe
+*_CYGGCCxASL_*_MAKE_PATH = DEF(VS2005_BIN)\nmake.exe
*_CYGGCCxASL_*_MAKE_FLAGS = /nologo
*_CYGGCCxASL_*_PP_FLAGS = -E -x assembler-with-cpp -include AutoGen.h
@@ -2066,7 +2024,7 @@
*_CYGGCCxASL_EBC_DLINK_PATH = DEF(EBC_BIN)\link.exe
*_CYGGCCxASL_EBC_SLINK_PATH = DEF(EBC_BIN)\link.exe
*_CYGGCCxASL_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe
-*_CYGGCCxASL_EBC_RC_PATH = DEF(MS_VS_BIN)\rc.exe
+*_CYGGCCxASL_EBC_RC_PATH = DEF(VS2005_BIN)\rc.exe
*_CYGGCCxASL_EBC_CC_FLAGS = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
*_CYGGCCxASL_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC
@@ -2175,15 +2133,15 @@
# ICC - Intel C Compiler V9.1
*_ICC_*_*_FAMILY = INTEL
-*_ICC_*_MAKE_PATH = DEF(MS_VS_BIN)\nmake.exe
-*_ICC_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe
+*_ICC_*_MAKE_PATH = DEF(VS2005_BIN)\nmake.exe
+*_ICC_*_RC_PATH = DEF(VS2005_BIN)\rc.exe
*_ICC_*_MAKE_FLAGS = /nologo
*_ICC_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
*_ICC_*_APP_FLAGS = /nologo /E /TC
*_ICC_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
-*_ICC_*_ASM16_PATH = DEF(MS_VS_BIN)\ml.exe
+*_ICC_*_ASM16_PATH = DEF(VS2005_BIN)\ml.exe
##################
# ASL definitions
@@ -2201,13 +2159,13 @@
*_ICC_IA32_CC_PATH = DEF(ICC_BIN32)\icl.exe
*_ICC_IA32_SLINK_PATH = DEF(ICC_BIN32)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICC_IA32_SLINK_DLL = DEF(MS_VS_DLL)
+*_ICC_IA32_SLINK_DLL = DEF(VS2005_BIN)
*_ICC_IA32_DLINK_PATH = DEF(ICC_BIN32)\xilink.exe
*_ICC_IA32_PP_PATH = DEF(ICC_BIN32)\icl.exe
*_ICC_IA32_VFRPP_PATH = DEF(ICC_BIN32)\icl.exe
*_ICC_IA32_APP_PATH = DEF(ICC_BIN32)\icl.exe
-*_ICC_IA32_ASM_PATH = DEF(MS_VS_BIN)\ml.exe
-*_ICC_IA32_ASM_DLL = DEF(MS_VS_DLL)
+*_ICC_IA32_ASM_PATH = DEF(VS2005_BIN)\ml.exe
+*_ICC_IA32_ASM_DLL = DEF(VS2005_DLL)
*_ICC_IA32_ASLCC_PATH = DEF(ICC_BIN32)\icl.exe
*_ICC_IA32_ASLPP_PATH = DEF(ICC_BIN32)\icl.exe
*_ICC_IA32_ASLDLINK_PATH = DEF(ICC_BIN32)\xilink.exe
@@ -2226,13 +2184,13 @@
*_ICC_X64_CC_PATH = DEF(ICC_BINX64)\icl.exe
*_ICC_X64_SLINK_PATH = DEF(ICC_BINX64)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICC_X64_SLINK_DLL = DEF(MS_VS_DLL)
+*_ICC_X64_SLINK_DLL = DEF(VS2005_BIN)
*_ICC_X64_DLINK_PATH = DEF(ICC_BINX64)\xilink.exe
*_ICC_X64_PP_PATH = DEF(ICC_BINX64)\icl.exe
*_ICC_X64_VFRPP_PATH = DEF(ICC_BINX64)\icl.exe
*_ICC_X64_APP_PATH = DEF(ICC_BINX64)\icl.exe
*_ICC_X64_ASM_PATH = DEF(WINDDK_BINX64)\ml64.exe
-*_ICC_X64_ASM_DLL = DEF(MS_VS_DLL)
+*_ICC_X64_ASM_DLL = DEF(VS2005_DLL)
*_ICC_X64_ASLCC_PATH = DEF(ICC_BINX64)\icl.exe
*_ICC_X64_ASLPP_PATH = DEF(ICC_BINX64)\icl.exe
*_ICC_X64_ASLDLINK_PATH = DEF(ICC_BINX64)\xilink.exe
@@ -2251,10 +2209,10 @@
##################
*_ICC_IPF_CC_PATH = DEF(ICC_BIN64)\icl.exe
# icl.exe needs cl.exe from Visual Studio
-*_ICC_IPF_CC_DLL = DEF(MS_VS_DLL)
+*_ICC_IPF_CC_DLL = DEF(VS2005_BIN)
*_ICC_IPF_SLINK_PATH = DEF(ICC_BIN64)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICC_IPF_SLINK_DLL = DEF(MS_VS_DLL)
+*_ICC_IPF_SLINK_DLL = DEF(VS2005_BIN);DEF(VS2005_DLL)
*_ICC_IPF_DLINK_PATH = DEF(ICC_BIN64)\xilink.exe
*_ICC_IPF_PP_PATH = DEF(ICC_BIN64)\icl.exe
*_ICC_IPF_VFRPP_PATH = DEF(ICC_BIN64)\icl.exe
@@ -2277,7 +2235,7 @@
##################
*_ICC_EBC_*_FAMILY = INTEL
-*_ICC_EBC_MAKE_PATH = DEF(MS_VS_BIN)\nmake.exe
+*_ICC_EBC_MAKE_PATH = DEF(VS2005_BIN)\nmake.exe
*_ICC_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe
*_ICC_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe
*_ICC_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe
@@ -2302,15 +2260,15 @@
# ICCxASL - Intel C Compiler V9.1
*_ICCxASL_*_*_FAMILY = INTEL
-*_ICCxASL_*_MAKE_PATH = DEF(MS_VS_BIN)\nmake.exe
-*_ICCxASL_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe
+*_ICCxASL_*_MAKE_PATH = DEF(VS2005_BIN)\nmake.exe
+*_ICCxASL_*_RC_PATH = DEF(VS2005_BIN)\rc.exe
*_ICCxASL_*_MAKE_FLAGS = /nologo
*_ICCxASL_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
*_ICCxASL_*_APP_FLAGS = /nologo /E /TC
*_ICCxASL_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
-*_ICCxASL_*_ASM16_PATH = DEF(MS_VS_BIN)\ml.exe
+*_ICCxASL_*_ASM16_PATH = DEF(VS2005_BIN)\ml.exe
##################
# ASL definitions
@@ -2328,13 +2286,13 @@
*_ICCxASL_IA32_CC_PATH = DEF(ICC_BIN32)\icl.exe
*_ICCxASL_IA32_SLINK_PATH = DEF(ICC_BIN32)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICCxASL_IA32_SLINK_DLL = DEF(MS_VS_DLL)
+*_ICCxASL_IA32_SLINK_DLL = DEF(VS2005_BIN)
*_ICCxASL_IA32_DLINK_PATH = DEF(ICC_BIN32)\xilink.exe
*_ICCxASL_IA32_PP_PATH = DEF(ICC_BIN32)\icl.exe
*_ICCxASL_IA32_VFRPP_PATH = DEF(ICC_BIN32)\icl.exe
*_ICCxASL_IA32_APP_PATH = DEF(ICC_BIN32)\icl.exe
-*_ICCxASL_IA32_ASM_PATH = DEF(MS_VS_BIN)\ml.exe
-*_ICCxASL_IA32_ASM_DLL = DEF(MS_VS_DLL)
+*_ICCxASL_IA32_ASM_PATH = DEF(VS2005_BIN)\ml.exe
+*_ICCxASL_IA32_ASM_DLL = DEF(VS2005_DLL)
*_ICCxASL_IA32_ASLCC_PATH = DEF(ICC_BIN32)\icl.exe
*_ICCxASL_IA32_ASLPP_PATH = DEF(ICC_BIN32)\icl.exe
*_ICCxASL_IA32_ASLDLINK_PATH = DEF(ICC_BIN32)\xilink.exe
@@ -2353,13 +2311,13 @@
*_ICCxASL_X64_CC_PATH = DEF(ICC_BINX64)\icl.exe
*_ICCxASL_X64_SLINK_PATH = DEF(ICC_BINX64)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICCxASL_X64_SLINK_DLL = DEF(MS_VS_DLL)
+*_ICCxASL_X64_SLINK_DLL = DEF(VS2005_BIN)
*_ICCxASL_X64_DLINK_PATH = DEF(ICC_BINX64)\xilink.exe
*_ICCxASL_X64_PP_PATH = DEF(ICC_BINX64)\icl.exe
*_ICCxASL_X64_VFRPP_PATH = DEF(ICC_BINX64)\icl.exe
*_ICCxASL_X64_APP_PATH = DEF(ICC_BINX64)\icl.exe
*_ICCxASL_X64_ASM_PATH = DEF(WINDDK_BINX64)\ml64.exe
-*_ICCxASL_X64_ASM_DLL = DEF(MS_VS_DLL)
+*_ICCxASL_X64_ASM_DLL = DEF(VS2005_DLL)
*_ICCxASL_X64_ASLCC_PATH = DEF(ICC_BINX64)\icl.exe
*_ICCxASL_X64_ASLPP_PATH = DEF(ICC_BINX64)\icl.exe
*_ICCxASL_X64_ASLDLINK_PATH = DEF(ICC_BINX64)\xilink.exe
@@ -2378,10 +2336,10 @@
##################
*_ICCxASL_IPF_CC_PATH = DEF(ICC_BIN64)\icl.exe
# icl.exe needs cl.exe from Visual Studio
-*_ICCxASL_IPF_CC_DLL = DEF(MS_VS_DLL)
+*_ICCxASL_IPF_CC_DLL = DEF(VS2005_BIN)
*_ICCxASL_IPF_SLINK_PATH = DEF(ICC_BIN64)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICCxASL_IPF_SLINK_DLL = DEF(MS_VS_DLL)
+*_ICCxASL_IPF_SLINK_DLL = DEF(VS2005_BIN);DEF(VS2005_DLL)
*_ICCxASL_IPF_DLINK_PATH = DEF(ICC_BIN64)\xilink.exe
*_ICCxASL_IPF_PP_PATH = DEF(ICC_BIN64)\icl.exe
*_ICCxASL_IPF_VFRPP_PATH = DEF(ICC_BIN64)\icl.exe
@@ -2404,7 +2362,7 @@
##################
*_ICCxASL_EBC_*_FAMILY = INTEL
-*_ICCxASL_EBC_MAKE_PATH = DEF(MS_VS_BIN)\nmake.exe
+*_ICCxASL_EBC_MAKE_PATH = DEF(VS2005_BIN)\nmake.exe
*_ICCxASL_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe
*_ICCxASL_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe
*_ICCxASL_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe
@@ -2430,15 +2388,15 @@
# ICCx86 - Intel C Compiler V9.1
*_ICCx86_*_*_FAMILY = INTEL
-*_ICCx86_*_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe
-*_ICCx86_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe
+*_ICCx86_*_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe
+*_ICCx86_*_RC_PATH = DEF(VS2005x86_BIN)\rc.exe
*_ICCx86_*_MAKE_FLAGS = /nologo
*_ICCx86_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
*_ICCx86_*_APP_FLAGS = /nologo /E /TC
*_ICCx86_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
-*_ICCx86_*_ASM16_PATH = DEF(MS_VSx86_BIN)\ml.exe
+*_ICCx86_*_ASM16_PATH = DEF(VS2005x86_BIN)\ml.exe
##################
# ASL definitions
@@ -2456,13 +2414,13 @@
*_ICCx86_IA32_CC_PATH = DEF(ICC_BIN32x86)\icl.exe
*_ICCx86_IA32_SLINK_PATH = DEF(ICC_BIN32x86)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICCx86_IA32_SLINK_DLL = DEF(MS_VSx86_DLL)
+*_ICCx86_IA32_SLINK_DLL = DEF(VS2005x86_BIN)
*_ICCx86_IA32_DLINK_PATH = DEF(ICC_BIN32x86)\xilink.exe
*_ICCx86_IA32_PP_PATH = DEF(ICC_BIN32x86)\icl.exe
*_ICCx86_IA32_VFRPP_PATH = DEF(ICC_BIN32x86)\icl.exe
*_ICCx86_IA32_APP_PATH = DEF(ICC_BIN32x86)\icl.exe
-*_ICCx86_IA32_ASM_PATH = DEF(MS_VSx86_BIN)\ml.exe
-*_ICCx86_IA32_ASM_DLL = DEF(MS_VSx86_DLL)
+*_ICCx86_IA32_ASM_PATH = DEF(VS2005x86_BIN)\ml.exe
+*_ICCx86_IA32_ASM_DLL = DEF(VS2005x86_DLL)
*_ICCx86_IA32_ASLCC_PATH = DEF(ICC_BIN32x86)\icl.exe
*_ICCx86_IA32_ASLPP_PATH = DEF(ICC_BIN32x86)\icl.exe
*_ICCx86_IA32_ASLDLINK_PATH = DEF(ICC_BIN32x86)\xilink.exe
@@ -2481,13 +2439,13 @@
*_ICCx86_X64_CC_PATH = DEF(ICC_BINX64x86)\icl.exe
*_ICCx86_X64_SLINK_PATH = DEF(ICC_BINX64x86)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICCx86_X64_SLINK_DLL = DEF(MS_VSx86_DLL)
+*_ICCx86_X64_SLINK_DLL = DEF(VS2005x86_BIN)
*_ICCx86_X64_DLINK_PATH = DEF(ICC_BINX64x86)\xilink.exe
*_ICCx86_X64_PP_PATH = DEF(ICC_BINX64x86)\icl.exe
*_ICCx86_X64_VFRPP_PATH = DEF(ICC_BINX64x86)\icl.exe
*_ICCx86_X64_APP_PATH = DEF(ICC_BINX64x86)\icl.exe
*_ICCx86_X64_ASM_PATH = DEF(WINDDK_BINX64)\ml64.exe
-*_ICCx86_X64_ASM_DLL = DEF(MS_VSx86_DLL)
+*_ICCx86_X64_ASM_DLL = DEF(VS2005x86_DLL)
*_ICCx86_X64_ASLCC_PATH = DEF(ICC_BINX64x86)\icl.exe
*_ICCx86_X64_ASLPP_PATH = DEF(ICC_BINX64x86)\icl.exe
*_ICCx86_X64_ASLDLINK_PATH = DEF(ICC_BINX64x86)\xilink.exe
@@ -2506,10 +2464,10 @@
##################
*_ICCx86_IPF_CC_PATH = DEF(ICC_BIN64x86)\icl.exe
# icl.exe needs cl.exe from Visual Studio
-*_ICCx86_IPF_CC_DLL = DEF(MS_VSx86_DLL)
+*_ICCx86_IPF_CC_DLL = DEF(VS2005x86_BIN)
*_ICCx86_IPF_SLINK_PATH = DEF(ICC_BIN64x86)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICCx86_IPF_SLINK_DLL = DEF(MS_VSx86_DLL)
+*_ICCx86_IPF_SLINK_DLL = DEF(VS2005x86_BIN);DEF(VS2005x86_DLL)
*_ICCx86_IPF_DLINK_PATH = DEF(ICC_BIN64x86)\xilink.exe
*_ICCx86_IPF_PP_PATH = DEF(ICC_BIN64x86)\icl.exe
*_ICCx86_IPF_VFRPP_PATH = DEF(ICC_BIN64x86)\icl.exe
@@ -2532,7 +2490,7 @@
##################
*_ICCx86_EBC_*_FAMILY = INTEL
-*_ICCx86_EBC_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe
+*_ICCx86_EBC_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe
*_ICCx86_EBC_PP_PATH = DEF(EBC_BINx86)\iec.exe
*_ICCx86_EBC_VFRPP_PATH = DEF(EBC_BINx86)\iec.exe
*_ICCx86_EBC_CC_PATH = DEF(EBC_BINx86)\iec.exe
@@ -2558,15 +2516,15 @@
# ICCx86xASL - Intel C Compiler V9.1
*_ICCx86xASL_*_*_FAMILY = INTEL
-*_ICCx86xASL_*_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe
-*_ICCx86xASL_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe
+*_ICCx86xASL_*_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe
+*_ICCx86xASL_*_RC_PATH = DEF(VS2005x86_BIN)\rc.exe
*_ICCx86xASL_*_MAKE_FLAGS = /nologo
*_ICCx86xASL_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
*_ICCx86xASL_*_APP_FLAGS = /nologo /E /TC
*_ICCx86xASL_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
-*_ICCx86xASL_*_ASM16_PATH = DEF(MS_VSx86_BIN)\ml.exe
+*_ICCx86ASL_*_ASM16_PATH = DEF(VS2005x86_BIN)\ml.exe
##################
# ASL definitions
@@ -2584,13 +2542,13 @@
*_ICCx86xASL_IA32_CC_PATH = DEF(ICC_BIN32x86)\icl.exe
*_ICCx86xASL_IA32_SLINK_PATH = DEF(ICC_BIN32x86)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICCx86xASL_IA32_SLINK_DLL = DEF(MS_VSx86_DLL)
+*_ICCx86xASL_IA32_SLINK_DLL = DEF(VS2005x86_BIN)
*_ICCx86xASL_IA32_DLINK_PATH = DEF(ICC_BIN32x86)\xilink.exe
*_ICCx86xASL_IA32_PP_PATH = DEF(ICC_BIN32x86)\icl.exe
*_ICCx86xASL_IA32_VFRPP_PATH = DEF(ICC_BIN32x86)\icl.exe
*_ICCx86xASL_IA32_APP_PATH = DEF(ICC_BIN32x86)\icl.exe
-*_ICCx86xASL_IA32_ASM_PATH = DEF(MS_VSx86_BIN)\ml.exe
-*_ICCx86xASL_IA32_ASM_DLL = DEF(MS_VSx86_DLL)
+*_ICCx86xASL_IA32_ASM_PATH = DEF(VS2005x86_BIN)\ml.exe
+*_ICCx86xASL_IA32_ASM_DLL = DEF(VS2005x86_DLL)
*_ICCx86xASL_IA32_ASLCC_PATH = DEF(ICC_BIN32x86)\icl.exe
*_ICCx86xASL_IA32_ASLPP_PATH = DEF(ICC_BIN32x86)\icl.exe
*_ICCx86xASL_IA32_ASLDLINK_PATH = DEF(ICC_BIN32x86)\xilink.exe
@@ -2609,13 +2567,13 @@
*_ICCx86xASL_X64_CC_PATH = DEF(ICC_BINX64x86)\icl.exe
*_ICCx86xASL_X64_SLINK_PATH = DEF(ICC_BINX64x86)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICCx86xASL_X64_SLINK_DLL = DEF(MS_VSx86_DLL)
+*_ICCx86xASL_X64_SLINK_DLL = DEF(VS2005x86_BIN)
*_ICCx86xASL_X64_DLINK_PATH = DEF(ICC_BINX64x86)\xilink.exe
*_ICCx86xASL_X64_PP_PATH = DEF(ICC_BINX64x86)\icl.exe
*_ICCx86xASL_X64_VFRPP_PATH = DEF(ICC_BINX64x86)\icl.exe
*_ICCx86xASL_X64_APP_PATH = DEF(ICC_BINX64x86)\icl.exe
*_ICCx86xASL_X64_ASM_PATH = DEF(WINDDK_BINX64)\ml64.exe
-*_ICCx86xASL_X64_ASM_DLL = DEF(MS_VSx86_DLL)
+*_ICCx86xASL_X64_ASM_DLL = DEF(VS2005x86_DLL)
*_ICCx86xASL_X64_ASLCC_PATH = DEF(ICC_BINX64x86)\icl.exe
*_ICCx86xASL_X64_ASLPP_PATH = DEF(ICC_BINX64x86)\icl.exe
*_ICCx86xASL_X64_ASLDLINK_PATH = DEF(ICC_BINX64x86)\xilink.exe
@@ -2634,10 +2592,10 @@
##################
*_ICCx86xASL_IPF_CC_PATH = DEF(ICC_BIN64x86)\icl.exe
# icl.exe needs cl.exe from Visual Studio
-*_ICCx86xASL_IPF_CC_DLL = DEF(MS_VSx86_DLL)
+*_ICCx86xASL_IPF_CC_DLL = DEF(VS2005x86_BIN)
*_ICCx86xASL_IPF_SLINK_PATH = DEF(ICC_BIN64x86)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICCx86xASL_IPF_SLINK_DLL = DEF(MS_VSx86_DLL)
+*_ICCx86xASL_IPF_SLINK_DLL = DEF(VS2005x86_BIN);DEF(VS2005x86_DLL)
*_ICCx86xASL_IPF_DLINK_PATH = DEF(ICC_BIN64x86)\xilink.exe
*_ICCx86xASL_IPF_PP_PATH = DEF(ICC_BIN64x86)\icl.exe
*_ICCx86xASL_IPF_VFRPP_PATH = DEF(ICC_BIN64x86)\icl.exe
@@ -2660,7 +2618,7 @@
##################
*_ICCx86xASL_EBC_*_FAMILY = INTEL
-*_ICCx86xASL_EBC_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe
+*_ICCx86xASL_EBC_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe
*_ICCx86xASL_EBC_PP_PATH = DEF(EBC_BINx86)\iec.exe
*_ICCx86xASL_EBC_VFRPP_PATH = DEF(EBC_BINx86)\iec.exe
*_ICCx86xASL_EBC_CC_PATH = DEF(EBC_BINx86)\iec.exe
@@ -2687,15 +2645,15 @@
# ICC11 - Intel C Compiler V11.1
*_ICC11_*_*_FAMILY = INTEL
-*_ICC11_*_MAKE_PATH = DEF(MS_VS_BIN)\nmake.exe
-*_ICC11_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe
+*_ICC11_*_MAKE_PATH = DEF(VS2005_BIN)\nmake.exe
+*_ICC11_*_RC_PATH = DEF(VS2005_BIN)\rc.exe
*_ICC11_*_MAKE_FLAGS = /nologo
*_ICC11_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
*_ICC11_*_APP_FLAGS = /nologo /E /TC
*_ICC11_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
-*_ICC11_*_ASM16_PATH = DEF(MS_VS_BIN)\ml.exe
+*_ICC11_*_ASM16_PATH = DEF(VS2005_BIN)\ml.exe
##################
# ASL definitions
@@ -2713,13 +2671,13 @@
*_ICC11_IA32_CC_PATH = DEF(ICC11_BIN32)\icl.exe
*_ICC11_IA32_SLINK_PATH = DEF(ICC11_BIN32)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICC11_IA32_SLINK_DLL = DEF(MS_VS_DLL)
+*_ICC11_IA32_SLINK_DLL = DEF(VS2005_BIN)
*_ICC11_IA32_DLINK_PATH = DEF(ICC11_BIN32)\xilink.exe
*_ICC11_IA32_PP_PATH = DEF(ICC11_BIN32)\icl.exe
*_ICC11_IA32_VFRPP_PATH = DEF(ICC11_BIN32)\icl.exe
*_ICC11_IA32_APP_PATH = DEF(ICC11_BIN32)\icl.exe
-*_ICC11_IA32_ASM_PATH = DEF(MS_VS_BIN)\ml.exe
-*_ICC11_IA32_ASM_DLL = DEF(MS_VS_DLL)
+*_ICC11_IA32_ASM_PATH = DEF(VS2005_BIN)\ml.exe
+*_ICC11_IA32_ASM_DLL = DEF(VS2005_DLL)
*_ICC11_IA32_ASLCC_PATH = DEF(ICC11_BIN32)\icl.exe
*_ICC11_IA32_ASLPP_PATH = DEF(ICC11_BIN32)\icl.exe
*_ICC11_IA32_ASLDLINK_PATH = DEF(ICC11_BIN32)\xilink.exe
@@ -2738,13 +2696,13 @@
*_ICC11_X64_CC_PATH = DEF(ICC11_BINX64)\icl.exe
*_ICC11_X64_SLINK_PATH = DEF(ICC11_BINX64)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICC11_X64_SLINK_DLL = DEF(MS_VS_DLL)
+*_ICC11_X64_SLINK_DLL = DEF(VS2005_BIN)
*_ICC11_X64_DLINK_PATH = DEF(ICC11_BINX64)\xilink.exe
*_ICC11_X64_PP_PATH = DEF(ICC11_BINX64)\icl.exe
*_ICC11_X64_VFRPP_PATH = DEF(ICC11_BINX64)\icl.exe
*_ICC11_X64_APP_PATH = DEF(ICC11_BINX64)\icl.exe
*_ICC11_X64_ASM_PATH = DEF(WINDDK_BINX64)\ml64.exe
-*_ICC11_X64_ASM_DLL = DEF(MS_VS_DLL)
+*_ICC11_X64_ASM_DLL = DEF(VS2005_DLL)
*_ICC11_X64_ASLCC_PATH = DEF(ICC11_BINX64)\icl.exe
*_ICC11_X64_ASLPP_PATH = DEF(ICC11_BINX64)\icl.exe
*_ICC11_X64_ASLDLINK_PATH = DEF(ICC11_BINX64)\xilink.exe
@@ -2763,10 +2721,10 @@
##################
*_ICC11_IPF_CC_PATH = DEF(ICC11_BIN64)\icl.exe
# icl.exe needs cl.exe from Visual Studio
-*_ICC11_IPF_CC_DLL = DEF(MS_VS_DLL)
+*_ICC11_IPF_CC_DLL = DEF(VS2005_BIN)
*_ICC11_IPF_SLINK_PATH = DEF(ICC11_BIN64)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICC11_IPF_SLINK_DLL = DEF(MS_VS_BIN);DEF(MS_VS_DLL)
+*_ICC11_IPF_SLINK_DLL = DEF(VS2005_BIN);DEF(VS2005_DLL)
*_ICC11_IPF_DLINK_PATH = DEF(ICC11_BIN64)\xilink.exe
*_ICC11_IPF_PP_PATH = DEF(ICC11_BIN64)\icl.exe
*_ICC11_IPF_VFRPP_PATH = DEF(ICC11_BIN64)\icl.exe
@@ -2789,7 +2747,7 @@
##################
*_ICC11_EBC_*_FAMILY = INTEL
-*_ICC11_EBC_MAKE_PATH = DEF(MS_VS_BIN)\nmake.exe
+*_ICC11_EBC_MAKE_PATH = DEF(VS2005_BIN)\nmake.exe
*_ICC11_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe
*_ICC11_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe
*_ICC11_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe
@@ -2816,15 +2774,15 @@
# ICC11xASL - Intel C Compiler V11.1
*_ICC11xASL_*_*_FAMILY = INTEL
-*_ICC11xASL_*_MAKE_PATH = DEF(MS_VS_BIN)\nmake.exe
-*_ICC11xASL_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe
+*_ICC11xASL_*_MAKE_PATH = DEF(VS2005_BIN)\nmake.exe
+*_ICC11xASL_*_RC_PATH = DEF(VS2005_BIN)\rc.exe
*_ICC11xASL_*_MAKE_FLAGS = /nologo
*_ICC11xASL_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
*_ICC11xASL_*_APP_FLAGS = /nologo /E /TC
*_ICC11xASL_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
-*_ICC11xASL_*_ASM16_PATH = DEF(MS_VS_BIN)\ml.exe
+*_ICC11xASL_*_ASM16_PATH = DEF(VS2005_BIN)\ml.exe
##################
# ASL definitions
@@ -2842,13 +2800,13 @@
*_ICC11xASL_IA32_CC_PATH = DEF(ICC11_BIN32)\icl.exe
*_ICC11xASL_IA32_SLINK_PATH = DEF(ICC11_BIN32)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICC11xASL_IA32_SLINK_DLL = DEF(MS_VS_DLL)
+*_ICC11xASL_IA32_SLINK_DLL = DEF(VS2005_BIN)
*_ICC11xASL_IA32_DLINK_PATH = DEF(ICC11_BIN32)\xilink.exe
*_ICC11xASL_IA32_PP_PATH = DEF(ICC11_BIN32)\icl.exe
*_ICC11xASL_IA32_VFRPP_PATH = DEF(ICC11_BIN32)\icl.exe
*_ICC11xASL_IA32_APP_PATH = DEF(ICC11_BIN32)\icl.exe
-*_ICC11xASL_IA32_ASM_PATH = DEF(MS_VS_BIN)\ml.exe
-*_ICC11xASL_IA32_ASM_DLL = DEF(MS_VS_DLL)
+*_ICC11xASL_IA32_ASM_PATH = DEF(VS2005_BIN)\ml.exe
+*_ICC11xASL_IA32_ASM_DLL = DEF(VS2005_DLL)
*_ICC11xASL_IA32_ASLCC_PATH = DEF(ICC11_BIN32)\icl.exe
*_ICC11xASL_IA32_ASLPP_PATH = DEF(ICC11_BIN32)\icl.exe
*_ICC11xASL_IA32_ASLDLINK_PATH = DEF(ICC11_BIN32)\xilink.exe
@@ -2867,13 +2825,13 @@
*_ICC11xASL_X64_CC_PATH = DEF(ICC11_BINX64)\icl.exe
*_ICC11xASL_X64_SLINK_PATH = DEF(ICC11_BINX64)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICC11xASL_X64_SLINK_DLL = DEF(MS_VS_DLL)
+*_ICC11xASL_X64_SLINK_DLL = DEF(VS2005_BIN)
*_ICC11xASL_X64_DLINK_PATH = DEF(ICC11_BINX64)\xilink.exe
*_ICC11xASL_X64_PP_PATH = DEF(ICC11_BINX64)\icl.exe
*_ICC11xASL_X64_VFRPP_PATH = DEF(ICC11_BINX64)\icl.exe
*_ICC11xASL_X64_APP_PATH = DEF(ICC11_BINX64)\icl.exe
*_ICC11xASL_X64_ASM_PATH = DEF(WINDDK_BINX64)\ml64.exe
-*_ICC11xASL_X64_ASM_DLL = DEF(MS_VS_DLL)
+*_ICC11xASL_X64_ASM_DLL = DEF(VS2005_DLL)
*_ICC11xASL_X64_ASLCC_PATH = DEF(ICC11_BINX64)\icl.exe
*_ICC11xASL_X64_ASLPP_PATH = DEF(ICC11_BINX64)\icl.exe
*_ICC11xASL_X64_ASLDLINK_PATH = DEF(ICC11_BINX64)\xilink.exe
@@ -2892,10 +2850,10 @@
##################
*_ICC11xASL_IPF_CC_PATH = DEF(ICC11_BIN64)\icl.exe
# icl.exe needs cl.exe from Visual Studio
-*_ICC11xASL_IPF_CC_DLL = DEF(MS_VS_DLL)
+*_ICC11xASL_IPF_CC_DLL = DEF(VS2005_BIN)
*_ICC11xASL_IPF_SLINK_PATH = DEF(ICC11_BIN64)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICC11xASL_IPF_SLINK_DLL = DEF(MS_VS_DLL)
+*_ICC11xASL_IPF_SLINK_DLL = DEF(VS2005_BIN);DEF(VS2005_DLL)
*_ICC11xASL_IPF_DLINK_PATH = DEF(ICC11_BIN64)\xilink.exe
*_ICC11xASL_IPF_PP_PATH = DEF(ICC11_BIN64)\icl.exe
*_ICC11xASL_IPF_VFRPP_PATH = DEF(ICC11_BIN64)\icl.exe
@@ -2918,7 +2876,7 @@
##################
*_ICC11xASL_EBC_*_FAMILY = INTEL
-*_ICC11xASL_EBC_MAKE_PATH = DEF(MS_VS_BIN)\nmake.exe
+*_ICC11xASL_EBC_MAKE_PATH = DEF(VS2005_BIN)\nmake.exe
*_ICC11xASL_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe
*_ICC11xASL_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe
*_ICC11xASL_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe
@@ -2946,15 +2904,15 @@
# ICC11x86 - Intel C Compiler V11.1
*_ICC11x86_*_*_FAMILY = INTEL
-*_ICC11x86_*_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe
-*_ICC11x86_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe
+*_ICC11x86_*_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe
+*_ICC11x86_*_RC_PATH = DEF(VS2005x86_BIN)\rc.exe
*_ICC11x86_*_MAKE_FLAGS = /nologo
*_ICC11x86_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
*_ICC11x86_*_APP_FLAGS = /nologo /E /TC
*_ICC11x86_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
-*_ICC11x86_*_ASM16_PATH = DEF(MS_VSx86_BIN)\ml.exe
+*_ICC11x86_*_ASM16_PATH = DEF(VS2005x86_BIN)\ml.exe
##################
# ASL definitions
@@ -2972,13 +2930,13 @@
*_ICC11x86_IA32_CC_PATH = DEF(ICC11_BIN32x86)\icl.exe
*_ICC11x86_IA32_SLINK_PATH = DEF(ICC11_BIN32x86)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICC11x86_IA32_SLINK_DLL = DEF(MS_VSx86_DLL)
+*_ICC11x86_IA32_SLINK_DLL = DEF(VS2005x86_BIN)
*_ICC11x86_IA32_DLINK_PATH = DEF(ICC11_BIN32x86)\xilink.exe
*_ICC11x86_IA32_PP_PATH = DEF(ICC11_BIN32x86)\icl.exe
*_ICC11x86_IA32_VFRPP_PATH = DEF(ICC11_BIN32x86)\icl.exe
*_ICC11x86_IA32_APP_PATH = DEF(ICC11_BIN32x86)\icl.exe
-*_ICC11x86_IA32_ASM_PATH = DEF(MS_VSx86_BIN)\ml.exe
-*_ICC11x86_IA32_ASM_DLL = DEF(MS_VSx86_DLL)
+*_ICC11x86_IA32_ASM_PATH = DEF(VS2005x86_BIN)\ml.exe
+*_ICC11x86_IA32_ASM_DLL = DEF(VS2005x86_DLL)
*_ICC11x86_IA32_ASLCC_PATH = DEF(ICC11_BIN32x86)\icl.exe
*_ICC11x86_IA32_ASLPP_PATH = DEF(ICC11_BIN32x86)\icl.exe
*_ICC11x86_IA32_ASLDLINK_PATH = DEF(ICC11_BIN32x86)\xilink.exe
@@ -2997,13 +2955,13 @@
*_ICC11x86_X64_CC_PATH = DEF(ICC11_BINX64x86)\icl.exe
*_ICC11x86_X64_SLINK_PATH = DEF(ICC11_BINX64x86)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICC11x86_X64_SLINK_DLL = DEF(MS_VSx86_DLL)
+*_ICC11x86_X64_SLINK_DLL = DEF(VS2005x86_BIN)
*_ICC11x86_X64_DLINK_PATH = DEF(ICC11_BINX64x86)\xilink.exe
*_ICC11x86_X64_PP_PATH = DEF(ICC11_BINX64x86)\icl.exe
*_ICC11x86_X64_VFRPP_PATH = DEF(ICC11_BINX64x86)\icl.exe
*_ICC11x86_X64_APP_PATH = DEF(ICC11_BINX64x86)\icl.exe
*_ICC11x86_X64_ASM_PATH = DEF(WINDDK_BINX64)\ml64.exe
-*_ICC11x86_X64_ASM_DLL = DEF(MS_VSx86_DLL)
+*_ICC11x86_X64_ASM_DLL = DEF(VS2005x86_DLL)
*_ICC11x86_X64_ASLCC_PATH = DEF(ICC11_BINX64x86)\icl.exe
*_ICC11x86_X64_ASLPP_PATH = DEF(ICC11_BINX64x86)\icl.exe
*_ICC11x86_X64_ASLDLINK_PATH = DEF(ICC11_BINX64x86)\xilink.exe
@@ -3022,10 +2980,10 @@
##################
*_ICC11x86_IPF_CC_PATH = DEF(ICC11_BIN64x86)\icl.exe
# icl.exe needs cl.exe from Visual Studio
-*_ICC11x86_IPF_CC_DLL = DEF(MS_VSx86_DLL)
+*_ICC11x86_IPF_CC_DLL = DEF(VS2005x86_BIN)
*_ICC11x86_IPF_SLINK_PATH = DEF(ICC11_BIN64x86)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICC11x86_IPF_SLINK_DLL = DEF(MS_VSx86_DLL)
+*_ICC11x86_IPF_SLINK_DLL = DEF(VS2005x86_BIN);DEF(VS2005x86_DLL)
*_ICC11x86_IPF_DLINK_PATH = DEF(ICC11_BIN64x86)\xilink.exe
*_ICC11x86_IPF_PP_PATH = DEF(ICC11_BIN64x86)\icl.exe
*_ICC11x86_IPF_VFRPP_PATH = DEF(ICC11_BIN64x86)\icl.exe
@@ -3048,7 +3006,7 @@
##################
*_ICC11x86_EBC_*_FAMILY = INTEL
-*_ICC11x86_EBC_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe
+*_ICC11x86_EBC_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe
*_ICC11x86_EBC_PP_PATH = DEF(EBC_BINx86)\iec.exe
*_ICC11x86_EBC_VFRPP_PATH = DEF(EBC_BINx86)\iec.exe
*_ICC11x86_EBC_CC_PATH = DEF(EBC_BINx86)\iec.exe
@@ -3076,15 +3034,15 @@
# ICC11x86xASL - Intel C Compiler V11.1
*_ICC11x86xASL_*_*_FAMILY = INTEL
-*_ICC11x86xASL_*_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe
-*_ICC11x86xASL_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe
+*_ICC11x86xASL_*_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe
+*_ICC11x86xASL_*_RC_PATH = DEF(VS2005x86_BIN)\rc.exe
*_ICC11x86xASL_*_MAKE_FLAGS = /nologo
*_ICC11x86xASL_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
*_ICC11x86xASL_*_APP_FLAGS = /nologo /E /TC
*_ICC11x86xASL_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
-*_ICC11x86xASL_*_ASM16_PATH = DEF(MS_VSx86_BIN)\ml.exe
+*_ICC11x86xASL_*_ASM16_PATH = DEF(VS2005x86_BIN)\ml.exe
##################
# ASL definitions
@@ -3102,13 +3060,13 @@
*_ICC11x86xASL_IA32_CC_PATH = DEF(ICC11_BIN32x86)\icl.exe
*_ICC11x86xASL_IA32_SLINK_PATH = DEF(ICC11_BIN32x86)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICC11x86xASL_IA32_SLINK_DLL = DEF(MS_VSx86_DLL)
+*_ICC11x86xASL_IA32_SLINK_DLL = DEF(VS2005x86_BIN)
*_ICC11x86xASL_IA32_DLINK_PATH = DEF(ICC11_BIN32x86)\xilink.exe
*_ICC11x86xASL_IA32_PP_PATH = DEF(ICC11_BIN32x86)\icl.exe
*_ICC11x86xASL_IA32_VFRPP_PATH = DEF(ICC11_BIN32x86)\icl.exe
*_ICC11x86xASL_IA32_APP_PATH = DEF(ICC11_BIN32x86)\icl.exe
-*_ICC11x86xASL_IA32_ASM_PATH = DEF(MS_VSx86_BIN)\ml.exe
-*_ICC11x86xASL_IA32_ASM_DLL = DEF(MS_VSx86_DLL)
+*_ICC11x86xASL_IA32_ASM_PATH = DEF(VS2005x86_BIN)\ml.exe
+*_ICC11x86xASL_IA32_ASM_DLL = DEF(VS2005x86_DLL)
*_ICC11x86xASL_IA32_ASLCC_PATH = DEF(ICC11_BIN32x86)\icl.exe
*_ICC11x86xASL_IA32_ASLPP_PATH = DEF(ICC11_BIN32x86)\icl.exe
*_ICC11x86xASL_IA32_ASLDLINK_PATH = DEF(ICC11_BIN32x86)\xilink.exe
@@ -3127,13 +3085,13 @@
*_ICC11x86xASL_X64_CC_PATH = DEF(ICC11_BINX64x86)\icl.exe
*_ICC11x86xASL_X64_SLINK_PATH = DEF(ICC11_BINX64x86)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICC11x86xASL_X64_SLINK_DLL = DEF(MS_VSx86_DLL)
+*_ICC11x86xASL_X64_SLINK_DLL = DEF(VS2005x86_BIN)
*_ICC11x86xASL_X64_DLINK_PATH = DEF(ICC11_BINX64x86)\xilink.exe
*_ICC11x86xASL_X64_PP_PATH = DEF(ICC11_BINX64x86)\icl.exe
*_ICC11x86xASL_X64_VFRPP_PATH = DEF(ICC11_BINX64x86)\icl.exe
*_ICC11x86xASL_X64_APP_PATH = DEF(ICC11_BINX64x86)\icl.exe
*_ICC11x86xASL_X64_ASM_PATH = DEF(WINDDK_BINX64)\ml64.exe
-*_ICC11x86xASL_X64_ASM_DLL = DEF(MS_VSx86_DLL)
+*_ICC11x86xASL_X64_ASM_DLL = DEF(VS2005x86_DLL)
*_ICC11x86xASL_X64_ASLCC_PATH = DEF(ICC11_BINX64x86)\icl.exe
*_ICC11x86xASL_X64_ASLPP_PATH = DEF(ICC11_BINX64x86)\icl.exe
*_ICC11x86xASL_X64_ASLDLINK_PATH = DEF(ICC11_BINX64x86)\xilink.exe
@@ -3152,10 +3110,10 @@
##################
*_ICC11x86xASL_IPF_CC_PATH = DEF(ICC11_BIN64x86)\icl.exe
# icl.exe needs cl.exe from Visual Studio
-*_ICC11x86xASL_IPF_CC_DLL = DEF(MS_VSx86_DLL)
+*_ICC11x86xASL_IPF_CC_DLL = DEF(VS2005x86_BIN)
*_ICC11x86xASL_IPF_SLINK_PATH = DEF(ICC11_BIN64x86)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICC11x86xASL_IPF_SLINK_DLL = DEF(MS_VSx86_DLL)
+*_ICC11x86xASL_IPF_SLINK_DLL = DEF(VS2005x86_BIN);DEF(VS2005x86_DLL)
*_ICC11x86xASL_IPF_DLINK_PATH = DEF(ICC11_BIN64x86)\xilink.exe
*_ICC11x86xASL_IPF_PP_PATH = DEF(ICC11_BIN64x86)\icl.exe
*_ICC11x86xASL_IPF_VFRPP_PATH = DEF(ICC11_BIN64x86)\icl.exe
@@ -3178,7 +3136,7 @@
##################
*_ICC11x86xASL_EBC_*_FAMILY = INTEL
-*_ICC11x86xASL_EBC_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe
+*_ICC11x86xASL_EBC_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe
*_ICC11x86xASL_EBC_PP_PATH = DEF(EBC_BINx86)\iec.exe
*_ICC11x86xASL_EBC_VFRPP_PATH = DEF(EBC_BINx86)\iec.exe
*_ICC11x86xASL_EBC_CC_PATH = DEF(EBC_BINx86)\iec.exe
@@ -3304,13 +3262,13 @@
##################
*_MYTOOLS_EBC_*_FAMILY = INTEL
-*_MYTOOLS_EBC_MAKE_PATH = DEF(VS2008_BIN)\nmake.exe
+*_MYTOOLS_EBC_MAKE_PATH = DEF(VS2005_BIN)\nmake.exe
*_MYTOOLS_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe
*_MYTOOLS_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe
*_MYTOOLS_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe
*_MYTOOLS_EBC_SLINK_PATH = DEF(EBC_BIN)\link.exe
*_MYTOOLS_EBC_DLINK_PATH = DEF(EBC_BIN)\link.exe
-*_MYTOOLS_EBC_RC_PATH = DEF(WINSDK_BIN)\rc.exe
+*_MYTOOLS_EBC_RC_PATH = DEF(VS2005_BIN)\rc.exe
*_MYTOOLS_EBC_MAKE_FLAGS = /nologo
*_MYTOOLS_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
