Menu
▾
▴
SF.net SVN: edk2-buildtools:[2091] trunk/BaseTools/Conf/tools_def.template
|
From: <eri...@us...> - 2010-11-11 02:25:49
|
Revision: 2091
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2091&view=rev
Author: erictian
Date: 2010-11-11 02:25:42 +0000 (Thu, 11 Nov 2010)
Log Message:
-----------
clean icc11 & vs2008 toolchain setting
Modified Paths:
--------------
trunk/BaseTools/Conf/tools_def.template
Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template 2010-11-10 06:14:10 UTC (rev 2090)
+++ trunk/BaseTools/Conf/tools_def.template 2010-11-11 02:25:42 UTC (rev 2091)
@@ -45,11 +45,16 @@
# 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(VS2005x86_BIN), DEF(VS2008_BIN), DEF(VS2008x86_BIN)
+# 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(VS2005x86_DLL), DEF(VS2008_BIN), DEF(VS2008x86_BIN)
+# Some MS_VS_DLL options: DEF(VS2003_DLL), DEF(VS2005_DLL), DEF(VS2008_DLL)
DEFINE MS_VS_DLL = DEF(VS2008_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
@@ -1243,7 +1248,26 @@
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)
@@ -1343,7 +1367,25 @@
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)
@@ -2159,7 +2201,7 @@
*_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_BIN)
+*_ICC_IA32_SLINK_DLL = DEF(MS_VS_DLL)
*_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
@@ -2184,7 +2226,7 @@
*_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_BIN)
+*_ICC_X64_SLINK_DLL = DEF(MS_VS_DLL)
*_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
@@ -2209,10 +2251,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_BIN)
+*_ICC_IPF_CC_DLL = DEF(MS_VS_DLL)
*_ICC_IPF_SLINK_PATH = DEF(ICC_BIN64)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICC_IPF_SLINK_DLL = DEF(MS_VS_BIN);DEF(MS_VS_DLL)
+*_ICC_IPF_SLINK_DLL = DEF(MS_VS_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
@@ -2286,7 +2328,7 @@
*_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_BIN)
+*_ICCxASL_IA32_SLINK_DLL = DEF(MS_VS_DLL)
*_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
@@ -2311,7 +2353,7 @@
*_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_BIN)
+*_ICCxASL_X64_SLINK_DLL = DEF(MS_VS_DLL)
*_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
@@ -2336,10 +2378,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_BIN)
+*_ICCxASL_IPF_CC_DLL = DEF(MS_VS_DLL)
*_ICCxASL_IPF_SLINK_PATH = DEF(ICC_BIN64)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICCxASL_IPF_SLINK_DLL = DEF(MS_VS_BIN);DEF(MS_VS_DLL)
+*_ICCxASL_IPF_SLINK_DLL = DEF(MS_VS_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
@@ -2388,15 +2430,15 @@
# ICCx86 - Intel C Compiler V9.1
*_ICCx86_*_*_FAMILY = INTEL
-*_ICCx86_*_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe
-*_ICCx86_*_RC_PATH = DEF(VS2005x86_BIN)\rc.exe
+*_ICCx86_*_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe
+*_ICCx86_*_RC_PATH = DEF(MS_VSx86_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
-*_ICCxASL_*_ASM16_PATH = DEF(VS2005x86_BIN)\ml.exe
+*_ICCx86_*_ASM16_PATH = DEF(MS_VSx86_BIN)\ml.exe
##################
# ASL definitions
@@ -2414,13 +2456,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(VS2005x86_BIN)
+*_ICCx86_IA32_SLINK_DLL = DEF(MS_VSx86_DLL)
*_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(VS2005x86_BIN)\ml.exe
-*_ICCx86_IA32_ASM_DLL = DEF(VS2005x86_DLL)
+*_ICCx86_IA32_ASM_PATH = DEF(MS_VSx86_BIN)\ml.exe
+*_ICCx86_IA32_ASM_DLL = DEF(MS_VSx86_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
@@ -2439,13 +2481,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(VS2005x86_BIN)
+*_ICCx86_X64_SLINK_DLL = DEF(MS_VSx86_DLL)
*_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(VS2005x86_DLL)
+*_ICCx86_X64_ASM_DLL = DEF(MS_VSx86_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
@@ -2464,10 +2506,10 @@
##################
*_ICCx86_IPF_CC_PATH = DEF(ICC_BIN64x86)\icl.exe
# icl.exe needs cl.exe from Visual Studio
-*_ICCx86_IPF_CC_DLL = DEF(VS2005x86_BIN)
+*_ICCx86_IPF_CC_DLL = DEF(MS_VSx86_DLL)
*_ICCx86_IPF_SLINK_PATH = DEF(ICC_BIN64x86)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICCx86_IPF_SLINK_DLL = DEF(VS2005x86_BIN);DEF(VS2005x86_DLL)
+*_ICCx86_IPF_SLINK_DLL = DEF(MS_VSx86_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
@@ -2490,12 +2532,12 @@
##################
*_ICCx86_EBC_*_FAMILY = INTEL
-*_ICCx86_EBC_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe
-*_ICCx86_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe
-*_ICCx86_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe
-*_ICCx86_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe
-*_ICCx86_EBC_SLINK_PATH = DEF(EBC_BIN)\link.exe
-*_ICCx86_EBC_DLINK_PATH = DEF(EBC_BIN)\link.exe
+*_ICCx86_EBC_MAKE_PATH = DEF(MS_VSx86_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
+*_ICCx86_EBC_SLINK_PATH = DEF(EBC_BINx86)\link.exe
+*_ICCx86_EBC_DLINK_PATH = DEF(EBC_BINx86)\link.exe
*_ICCx86_EBC_MAKE_FLAGS = /nologo
*_ICCx86_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
@@ -2516,15 +2558,15 @@
# ICCx86xASL - Intel C Compiler V9.1
*_ICCx86xASL_*_*_FAMILY = INTEL
-*_ICCx86xASL_*_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe
-*_ICCx86xASL_*_RC_PATH = DEF(VS2005x86_BIN)\rc.exe
+*_ICCx86xASL_*_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe
+*_ICCx86xASL_*_RC_PATH = DEF(MS_VSx86_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
-*_ICCx86ASL_*_ASM16_PATH = DEF(VS2005x86_BIN)\ml.exe
+*_ICCx86xASL_*_ASM16_PATH = DEF(MS_VSx86_BIN)\ml.exe
##################
# ASL definitions
@@ -2542,13 +2584,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(VS2005x86_BIN)
+*_ICCx86xASL_IA32_SLINK_DLL = DEF(MS_VSx86_DLL)
*_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(VS2005x86_BIN)\ml.exe
-*_ICCx86xASL_IA32_ASM_DLL = DEF(VS2005x86_DLL)
+*_ICCx86xASL_IA32_ASM_PATH = DEF(MS_VSx86_BIN)\ml.exe
+*_ICCx86xASL_IA32_ASM_DLL = DEF(MS_VSx86_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
@@ -2567,13 +2609,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(VS2005x86_BIN)
+*_ICCx86xASL_X64_SLINK_DLL = DEF(MS_VSx86_DLL)
*_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(VS2005x86_DLL)
+*_ICCx86xASL_X64_ASM_DLL = DEF(MS_VSx86_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
@@ -2592,10 +2634,10 @@
##################
*_ICCx86xASL_IPF_CC_PATH = DEF(ICC_BIN64x86)\icl.exe
# icl.exe needs cl.exe from Visual Studio
-*_ICCx86xASL_IPF_CC_DLL = DEF(VS2005x86_BIN)
+*_ICCx86xASL_IPF_CC_DLL = DEF(MS_VSx86_DLL)
*_ICCx86xASL_IPF_SLINK_PATH = DEF(ICC_BIN64x86)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICCx86xASL_IPF_SLINK_DLL = DEF(VS2005x86_BIN);DEF(VS2005x86_DLL)
+*_ICCx86xASL_IPF_SLINK_DLL = DEF(MS_VSx86_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
@@ -2618,12 +2660,12 @@
##################
*_ICCx86xASL_EBC_*_FAMILY = INTEL
-*_ICCx86xASL_EBC_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe
-*_ICCx86xASL_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe
-*_ICCx86xASL_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe
-*_ICCx86xASL_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe
-*_ICCx86xASL_EBC_SLINK_PATH = DEF(EBC_BIN)\link.exe
-*_ICCx86xASL_EBC_DLINK_PATH = DEF(EBC_BIN)\link.exe
+*_ICCx86xASL_EBC_MAKE_PATH = DEF(MS_VSx86_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
+*_ICCx86xASL_EBC_SLINK_PATH = DEF(EBC_BINx86)\link.exe
+*_ICCx86xASL_EBC_DLINK_PATH = DEF(EBC_BINx86)\link.exe
*_ICCx86xASL_EBC_MAKE_FLAGS = /nologo
*_ICCx86xASL_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
@@ -2671,7 +2713,7 @@
*_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_BIN)
+*_ICC11_IA32_SLINK_DLL = DEF(MS_VS_DLL)
*_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
@@ -2696,7 +2738,7 @@
*_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_BIN)
+*_ICC11_X64_SLINK_DLL = DEF(MS_VS_DLL)
*_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
@@ -2721,7 +2763,7 @@
##################
*_ICC11_IPF_CC_PATH = DEF(ICC11_BIN64)\icl.exe
# icl.exe needs cl.exe from Visual Studio
-*_ICC11_IPF_CC_DLL = DEF(MS_VS_BIN)
+*_ICC11_IPF_CC_DLL = DEF(MS_VS_DLL)
*_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)
@@ -2800,7 +2842,7 @@
*_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_BIN)
+*_ICC11xASL_IA32_SLINK_DLL = DEF(MS_VS_DLL)
*_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
@@ -2825,7 +2867,7 @@
*_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_BIN)
+*_ICC11xASL_X64_SLINK_DLL = DEF(MS_VS_DLL)
*_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
@@ -2850,10 +2892,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_BIN)
+*_ICC11xASL_IPF_CC_DLL = DEF(MS_VS_DLL)
*_ICC11xASL_IPF_SLINK_PATH = DEF(ICC11_BIN64)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICC11xASL_IPF_SLINK_DLL = DEF(MS_VS_BIN);DEF(MS_VS_DLL)
+*_ICC11xASL_IPF_SLINK_DLL = DEF(MS_VS_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
@@ -2904,15 +2946,15 @@
# ICC11x86 - Intel C Compiler V11.1
*_ICC11x86_*_*_FAMILY = INTEL
-*_ICC11x86_*_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe
-*_ICC11x86_*_RC_PATH = DEF(VS2005x86_BIN)\rc.exe
+*_ICC11x86_*_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe
+*_ICC11x86_*_RC_PATH = DEF(MS_VSx86_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(VS2005x86_BIN)\ml.exe
+*_ICC11x86_*_ASM16_PATH = DEF(MS_VSx86_BIN)\ml.exe
##################
# ASL definitions
@@ -2930,13 +2972,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(VS2005x86_BIN)
+*_ICC11x86_IA32_SLINK_DLL = DEF(MS_VSx86_DLL)
*_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(VS2005x86_BIN)\ml.exe
-*_ICC11x86_IA32_ASM_DLL = DEF(VS2005x86_DLL)
+*_ICC11x86_IA32_ASM_PATH = DEF(MS_VSx86_BIN)\ml.exe
+*_ICC11x86_IA32_ASM_DLL = DEF(MS_VSx86_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
@@ -2955,13 +2997,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(VS2005x86_BIN)
+*_ICC11x86_X64_SLINK_DLL = DEF(MS_VSx86_DLL)
*_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(VS2005x86_DLL)
+*_ICC11x86_X64_ASM_DLL = DEF(MS_VSx86_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
@@ -2980,10 +3022,10 @@
##################
*_ICC11x86_IPF_CC_PATH = DEF(ICC11_BIN64x86)\icl.exe
# icl.exe needs cl.exe from Visual Studio
-*_ICC11x86_IPF_CC_DLL = DEF(VS2005x86_BIN)
+*_ICC11x86_IPF_CC_DLL = DEF(MS_VSx86_DLL)
*_ICC11x86_IPF_SLINK_PATH = DEF(ICC11_BIN64x86)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICC11x86_IPF_SLINK_DLL = DEF(VS2005x86_BIN);DEF(VS2005x86_DLL)
+*_ICC11x86_IPF_SLINK_DLL = DEF(MS_VSx86_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
@@ -3006,12 +3048,12 @@
##################
*_ICC11x86_EBC_*_FAMILY = INTEL
-*_ICC11x86_EBC_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe
-*_ICC11x86_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe
-*_ICC11x86_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe
-*_ICC11x86_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe
-*_ICC11x86_EBC_SLINK_PATH = DEF(EBC_BIN)\link.exe
-*_ICC11x86_EBC_DLINK_PATH = DEF(EBC_BIN)\link.exe
+*_ICC11x86_EBC_MAKE_PATH = DEF(MS_VSx86_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
+*_ICC11x86_EBC_SLINK_PATH = DEF(EBC_BINx86)\link.exe
+*_ICC11x86_EBC_DLINK_PATH = DEF(EBC_BINx86)\link.exe
*_ICC11x86_EBC_MAKE_FLAGS = /nologo
*_ICC11x86_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
@@ -3034,15 +3076,15 @@
# ICC11x86xASL - Intel C Compiler V11.1
*_ICC11x86xASL_*_*_FAMILY = INTEL
-*_ICC11x86xASL_*_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe
-*_ICC11x86xASL_*_RC_PATH = DEF(VS2005x86_BIN)\rc.exe
+*_ICC11x86xASL_*_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe
+*_ICC11x86xASL_*_RC_PATH = DEF(MS_VSx86_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(VS2005x86_BIN)\ml.exe
+*_ICC11x86xASL_*_ASM16_PATH = DEF(MS_VSx86_BIN)\ml.exe
##################
# ASL definitions
@@ -3060,13 +3102,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(VS2005x86_BIN)
+*_ICC11x86xASL_IA32_SLINK_DLL = DEF(MS_VSx86_DLL)
*_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(VS2005x86_BIN)\ml.exe
-*_ICC11x86xASL_IA32_ASM_DLL = DEF(VS2005x86_DLL)
+*_ICC11x86xASL_IA32_ASM_PATH = DEF(MS_VSx86_BIN)\ml.exe
+*_ICC11x86xASL_IA32_ASM_DLL = DEF(MS_VSx86_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
@@ -3085,13 +3127,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(VS2005x86_BIN)
+*_ICC11x86xASL_X64_SLINK_DLL = DEF(MS_VSx86_DLL)
*_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(VS2005x86_DLL)
+*_ICC11x86xASL_X64_ASM_DLL = DEF(MS_VSx86_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
@@ -3110,10 +3152,10 @@
##################
*_ICC11x86xASL_IPF_CC_PATH = DEF(ICC11_BIN64x86)\icl.exe
# icl.exe needs cl.exe from Visual Studio
-*_ICC11x86xASL_IPF_CC_DLL = DEF(VS2005x86_BIN)
+*_ICC11x86xASL_IPF_CC_DLL = DEF(MS_VSx86_DLL)
*_ICC11x86xASL_IPF_SLINK_PATH = DEF(ICC11_BIN64x86)\xilib.exe
# xilib.exe needs lib.exe from Visual Studio
-*_ICC11x86xASL_IPF_SLINK_DLL = DEF(VS2005x86_BIN);DEF(VS2005x86_DLL)
+*_ICC11x86xASL_IPF_SLINK_DLL = DEF(MS_VSx86_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
@@ -3136,12 +3178,12 @@
##################
*_ICC11x86xASL_EBC_*_FAMILY = INTEL
-*_ICC11x86xASL_EBC_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe
-*_ICC11x86xASL_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe
-*_ICC11x86xASL_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe
-*_ICC11x86xASL_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe
-*_ICC11x86xASL_EBC_SLINK_PATH = DEF(EBC_BIN)\link.exe
-*_ICC11x86xASL_EBC_DLINK_PATH = DEF(EBC_BIN)\link.exe
+*_ICC11x86xASL_EBC_MAKE_PATH = DEF(MS_VSx86_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
+*_ICC11x86xASL_EBC_SLINK_PATH = DEF(EBC_BINx86)\link.exe
+*_ICC11x86xASL_EBC_DLINK_PATH = DEF(EBC_BINx86)\link.exe
*_ICC11x86xASL_EBC_MAKE_FLAGS = /nologo
*_ICC11x86xASL_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
@@ -3262,13 +3304,13 @@
##################
*_MYTOOLS_EBC_*_FAMILY = INTEL
-*_MYTOOLS_EBC_MAKE_PATH = DEF(VS2005_BIN)\nmake.exe
+*_MYTOOLS_EBC_MAKE_PATH = DEF(VS2008_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(VS2005_BIN)\rc.exe
+*_MYTOOLS_EBC_RC_PATH = DEF(VS2008_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.
|
