# are used by other toolchains. An example is that ICC on Windows normally\r
# uses Microsoft's nmake.exe.\r
\r
-# Some MS_VS_BIN options: DEF(VS2003_BIN), DEF(VS2005_BIN), DEF(VS2008_BIN)\r
-DEFINE MS_VS_BIN = DEF(VS2008_BIN)\r
-# Some MS_VS_DLL options: DEF(VS2003_DLL), DEF(VS2005_DLL), DEF(VS2008_DLL)\r
-DEFINE MS_VS_DLL = DEF(VS2008_DLL)\r
-\r
-# Some MS_VSx86_BIN options: DEF(VS2005x86_BIN), DEF(VS2008x86_BIN)\r
-DEFINE MS_VSx86_BIN = DEF(VS2008x86_BIN)\r
-# Some MS_VSx86_DLL options: DEF(VS2005x86_DLL), DEF(VS2008x86_DLL)\r
-DEFINE MS_VSx86_DLL = DEF(VS2008x86_DLL)\r
+# Some MS_VS_BIN options: DEF(VS2003_BIN), DEF(VS2005_BIN), DEF(VS2005x86_BIN)\r
+DEFINE MS_VS_BIN = DEF(VS2005_BIN)\r
+# Some MS_VS_DLL options: DEF(VS2003_DLL), DEF(VS2005_DLL), DEF(VS2005x86_DLL)\r
+DEFINE MS_VS_DLL = DEF(VS2005_DLL)\r
\r
DEFINE WINDDK_BIN16 = C:\WINDDK\3790.1830\bin\bin16\r
DEFINE WINDDK_BIN32 = C:\WINDDK\3790.1830\bin\x86\r
\r
*_VS2008x86_*_MAKE_PATH = DEF(VS2008x86_BIN)\nmake.exe\r
*_VS2008x86_*_MAKE_FLAG = /nologo\r
-*_VS2008x86_*_RC_PATH = DEF(WINSDKx86_BIN)\rc.exe\r
+*_VS2008x86_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe\r
\r
*_VS2008x86_*_MAKE_FLAGS = /nologo\r
*_VS2008x86_*_SLINK_FLAGS = /NOLOGO /LTCG\r
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\r
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\r
\r
-##################\r
-# EBC definitions\r
-##################\r
-*_VS2008x86_EBC_*_FAMILY = INTEL\r
-\r
-*_VS2008x86_EBC_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe\r
-*_VS2008x86_EBC_PP_PATH = DEF(EBC_BINx86)\iec.exe\r
-*_VS2008x86_EBC_VFRPP_PATH = DEF(EBC_BINx86)\iec.exe\r
-*_VS2008x86_EBC_CC_PATH = DEF(EBC_BINx86)\iec.exe\r
-*_VS2008x86_EBC_SLINK_PATH = DEF(EBC_BINx86)\link.exe\r
-*_VS2008x86_EBC_DLINK_PATH = DEF(EBC_BINx86)\link.exe\r
-\r
-*_VS2008x86_EBC_MAKE_FLAGS = /nologo\r
-*_VS2008x86_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h\r
-*_VS2008x86_EBC_CC_FLAGS = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
-*_VS2008x86_EBC_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-*_VS2008x86_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC\r
-*_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\r
-\r
\r
####################################################################################\r
# VS2008x86xASL - Microsoft Visual Studio 2008 with Microsoft ASL\r
\r
*_VS2008x86xASL_*_MAKE_PATH = DEF(VS2008x86_BIN)\nmake.exe\r
*_VS2008x86xASL_*_MAKE_FLAG = /nologo\r
-*_VS2008x86xASL_*_RC_PATH = DEF(WINSDKx86_BIN)\rc.exe\r
+*_VS2008x86xASL_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe\r
\r
*_VS2008x86xASL_*_MAKE_FLAGS = /nologo\r
*_VS2008x86xASL_*_SLINK_FLAGS = /NOLOGO /LTCG\r
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\r
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\r
\r
-##################\r
-# EBC definitions\r
-##################\r
-*_VS2008x86xASL_EBC_*_FAMILY = INTEL\r
-\r
-*_VS2008x86xASL_EBC_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe\r
-*_VS2008x86xASL_EBC_PP_PATH = DEF(EBC_BINx86)\iec.exe\r
-*_VS2008x86xASL_EBC_VFRPP_PATH = DEF(EBC_BINx86)\iec.exe\r
-*_VS2008x86xASL_EBC_CC_PATH = DEF(EBC_BINx86)\iec.exe\r
-*_VS2008x86xASL_EBC_SLINK_PATH = DEF(EBC_BINx86)\link.exe\r
-*_VS2008x86xASL_EBC_DLINK_PATH = DEF(EBC_BINx86)\link.exe\r
-\r
-*_VS2008x86_EBC_MAKE_FLAGS = /nologo\r
-*_VS2008x86_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h\r
-*_VS2008x86_EBC_CC_FLAGS = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
-*_VS2008x86_EBC_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-*_VS2008x86_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC\r
-*_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\r
\r
####################################################################################\r
#\r
*_ICC_IA32_CC_PATH = DEF(ICC_BIN32)\icl.exe\r
*_ICC_IA32_SLINK_PATH = DEF(ICC_BIN32)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
-*_ICC_IA32_SLINK_DLL = DEF(MS_VS_DLL)\r
+*_ICC_IA32_SLINK_DLL = DEF(MS_VS_BIN)\r
*_ICC_IA32_DLINK_PATH = DEF(ICC_BIN32)\xilink.exe\r
*_ICC_IA32_PP_PATH = DEF(ICC_BIN32)\icl.exe\r
*_ICC_IA32_VFRPP_PATH = DEF(ICC_BIN32)\icl.exe\r
*_ICC_X64_CC_PATH = DEF(ICC_BINX64)\icl.exe\r
*_ICC_X64_SLINK_PATH = DEF(ICC_BINX64)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
-*_ICC_X64_SLINK_DLL = DEF(MS_VS_DLL)\r
+*_ICC_X64_SLINK_DLL = DEF(MS_VS_BIN)\r
*_ICC_X64_DLINK_PATH = DEF(ICC_BINX64)\xilink.exe\r
*_ICC_X64_PP_PATH = DEF(ICC_BINX64)\icl.exe\r
*_ICC_X64_VFRPP_PATH = DEF(ICC_BINX64)\icl.exe\r
##################\r
*_ICC_IPF_CC_PATH = DEF(ICC_BIN64)\icl.exe\r
# icl.exe needs cl.exe from Visual Studio\r
-*_ICC_IPF_CC_DLL = DEF(MS_VS_DLL)\r
+*_ICC_IPF_CC_DLL = DEF(MS_VS_BIN)\r
*_ICC_IPF_SLINK_PATH = DEF(ICC_BIN64)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
-*_ICC_IPF_SLINK_DLL = DEF(MS_VS_DLL)\r
+*_ICC_IPF_SLINK_DLL = DEF(MS_VS_BIN);DEF(MS_VS_DLL)\r
*_ICC_IPF_DLINK_PATH = DEF(ICC_BIN64)\xilink.exe\r
*_ICC_IPF_PP_PATH = DEF(ICC_BIN64)\icl.exe\r
*_ICC_IPF_VFRPP_PATH = DEF(ICC_BIN64)\icl.exe\r
*_ICCxASL_IA32_CC_PATH = DEF(ICC_BIN32)\icl.exe\r
*_ICCxASL_IA32_SLINK_PATH = DEF(ICC_BIN32)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
-*_ICCxASL_IA32_SLINK_DLL = DEF(MS_VS_DLL)\r
+*_ICCxASL_IA32_SLINK_DLL = DEF(MS_VS_BIN)\r
*_ICCxASL_IA32_DLINK_PATH = DEF(ICC_BIN32)\xilink.exe\r
*_ICCxASL_IA32_PP_PATH = DEF(ICC_BIN32)\icl.exe\r
*_ICCxASL_IA32_VFRPP_PATH = DEF(ICC_BIN32)\icl.exe\r
*_ICCxASL_X64_CC_PATH = DEF(ICC_BINX64)\icl.exe\r
*_ICCxASL_X64_SLINK_PATH = DEF(ICC_BINX64)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
-*_ICCxASL_X64_SLINK_DLL = DEF(MS_VS_DLL)\r
+*_ICCxASL_X64_SLINK_DLL = DEF(MS_VS_BIN)\r
*_ICCxASL_X64_DLINK_PATH = DEF(ICC_BINX64)\xilink.exe\r
*_ICCxASL_X64_PP_PATH = DEF(ICC_BINX64)\icl.exe\r
*_ICCxASL_X64_VFRPP_PATH = DEF(ICC_BINX64)\icl.exe\r
##################\r
*_ICCxASL_IPF_CC_PATH = DEF(ICC_BIN64)\icl.exe\r
# icl.exe needs cl.exe from Visual Studio\r
-*_ICCxASL_IPF_CC_DLL = DEF(MS_VS_DLL)\r
+*_ICCxASL_IPF_CC_DLL = DEF(MS_VS_BIN)\r
*_ICCxASL_IPF_SLINK_PATH = DEF(ICC_BIN64)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
-*_ICCxASL_IPF_SLINK_DLL = DEF(MS_VS_DLL)\r
+*_ICCxASL_IPF_SLINK_DLL = DEF(MS_VS_BIN);DEF(MS_VS_DLL)\r
*_ICCxASL_IPF_DLINK_PATH = DEF(ICC_BIN64)\xilink.exe\r
*_ICCxASL_IPF_PP_PATH = DEF(ICC_BIN64)\icl.exe\r
*_ICCxASL_IPF_VFRPP_PATH = DEF(ICC_BIN64)\icl.exe\r
# ICCx86 - Intel C Compiler V9.1\r
*_ICCx86_*_*_FAMILY = INTEL\r
\r
-*_ICCx86_*_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe\r
-*_ICCx86_*_RC_PATH = DEF(MS_VSx86_BIN)\rc.exe\r
+*_ICCx86_*_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe\r
+*_ICCx86_*_RC_PATH = DEF(VS2005x86_BIN)\rc.exe\r
\r
*_ICCx86_*_MAKE_FLAGS = /nologo\r
*_ICCx86_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
*_ICCx86_*_APP_FLAGS = /nologo /E /TC\r
*_ICCx86_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h\r
\r
-*_ICCx86_*_ASM16_PATH = DEF(MS_VSx86_BIN)\ml.exe\r
+*_ICCx86_*_ASM16_PATH = DEF(VS2005x86_BIN)\ml.exe\r
\r
##################\r
# ASL definitions\r
*_ICCx86_IA32_CC_PATH = DEF(ICC_BIN32x86)\icl.exe\r
*_ICCx86_IA32_SLINK_PATH = DEF(ICC_BIN32x86)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
-*_ICCx86_IA32_SLINK_DLL = DEF(MS_VSx86_DLL)\r
+*_ICCx86_IA32_SLINK_DLL = DEF(VS2005x86_BIN)\r
*_ICCx86_IA32_DLINK_PATH = DEF(ICC_BIN32x86)\xilink.exe\r
*_ICCx86_IA32_PP_PATH = DEF(ICC_BIN32x86)\icl.exe\r
*_ICCx86_IA32_VFRPP_PATH = DEF(ICC_BIN32x86)\icl.exe\r
*_ICCx86_IA32_APP_PATH = DEF(ICC_BIN32x86)\icl.exe\r
-*_ICCx86_IA32_ASM_PATH = DEF(MS_VSx86_BIN)\ml.exe\r
-*_ICCx86_IA32_ASM_DLL = DEF(MS_VSx86_DLL)\r
+*_ICCx86_IA32_ASM_PATH = DEF(VS2005x86_BIN)\ml.exe\r
+*_ICCx86_IA32_ASM_DLL = DEF(VS2005x86_DLL)\r
*_ICCx86_IA32_ASLCC_PATH = DEF(ICC_BIN32x86)\icl.exe\r
*_ICCx86_IA32_ASLPP_PATH = DEF(ICC_BIN32x86)\icl.exe\r
*_ICCx86_IA32_ASLDLINK_PATH = DEF(ICC_BIN32x86)\xilink.exe\r
*_ICCx86_X64_CC_PATH = DEF(ICC_BINX64x86)\icl.exe\r
*_ICCx86_X64_SLINK_PATH = DEF(ICC_BINX64x86)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
-*_ICCx86_X64_SLINK_DLL = DEF(MS_VSx86_DLL)\r
+*_ICCx86_X64_SLINK_DLL = DEF(VS2005x86_BIN)\r
*_ICCx86_X64_DLINK_PATH = DEF(ICC_BINX64x86)\xilink.exe\r
*_ICCx86_X64_PP_PATH = DEF(ICC_BINX64x86)\icl.exe\r
*_ICCx86_X64_VFRPP_PATH = DEF(ICC_BINX64x86)\icl.exe\r
*_ICCx86_X64_APP_PATH = DEF(ICC_BINX64x86)\icl.exe\r
*_ICCx86_X64_ASM_PATH = DEF(WINDDK_BINX64)\ml64.exe\r
-*_ICCx86_X64_ASM_DLL = DEF(MS_VSx86_DLL)\r
+*_ICCx86_X64_ASM_DLL = DEF(VS2005x86_DLL)\r
*_ICCx86_X64_ASLCC_PATH = DEF(ICC_BINX64x86)\icl.exe\r
*_ICCx86_X64_ASLPP_PATH = DEF(ICC_BINX64x86)\icl.exe\r
*_ICCx86_X64_ASLDLINK_PATH = DEF(ICC_BINX64x86)\xilink.exe\r
##################\r
*_ICCx86_IPF_CC_PATH = DEF(ICC_BIN64x86)\icl.exe\r
# icl.exe needs cl.exe from Visual Studio\r
-*_ICCx86_IPF_CC_DLL = DEF(MS_VSx86_DLL)\r
+*_ICCx86_IPF_CC_DLL = DEF(VS2005x86_BIN)\r
*_ICCx86_IPF_SLINK_PATH = DEF(ICC_BIN64x86)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
-*_ICCx86_IPF_SLINK_DLL = DEF(MS_VSx86_DLL)\r
+*_ICCx86_IPF_SLINK_DLL = DEF(VS2005x86_BIN);DEF(VS2005x86_DLL)\r
*_ICCx86_IPF_DLINK_PATH = DEF(ICC_BIN64x86)\xilink.exe\r
*_ICCx86_IPF_PP_PATH = DEF(ICC_BIN64x86)\icl.exe\r
*_ICCx86_IPF_VFRPP_PATH = DEF(ICC_BIN64x86)\icl.exe\r
##################\r
*_ICCx86_EBC_*_FAMILY = INTEL\r
\r
-*_ICCx86_EBC_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe\r
+*_ICCx86_EBC_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe\r
*_ICCx86_EBC_PP_PATH = DEF(EBC_BINx86)\iec.exe\r
*_ICCx86_EBC_VFRPP_PATH = DEF(EBC_BINx86)\iec.exe\r
*_ICCx86_EBC_CC_PATH = DEF(EBC_BINx86)\iec.exe\r
# ICCx86xASL - Intel C Compiler V9.1\r
*_ICCx86xASL_*_*_FAMILY = INTEL\r
\r
-*_ICCx86xASL_*_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe\r
-*_ICCx86xASL_*_RC_PATH = DEF(MS_VSx86_BIN)\rc.exe\r
+*_ICCx86xASL_*_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe\r
+*_ICCx86xASL_*_RC_PATH = DEF(VS2005x86_BIN)\rc.exe\r
\r
*_ICCx86xASL_*_MAKE_FLAGS = /nologo\r
*_ICCx86xASL_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
*_ICCx86xASL_*_APP_FLAGS = /nologo /E /TC\r
*_ICCx86xASL_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h\r
\r
-*_ICCx86xASL_*_ASM16_PATH = DEF(MS_VSx86_BIN)\ml.exe\r
+*_ICCx86ASL_*_ASM16_PATH = DEF(VS2005x86_BIN)\ml.exe\r
\r
##################\r
# ASL definitions\r
*_ICCx86xASL_IA32_CC_PATH = DEF(ICC_BIN32x86)\icl.exe\r
*_ICCx86xASL_IA32_SLINK_PATH = DEF(ICC_BIN32x86)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
-*_ICCx86xASL_IA32_SLINK_DLL = DEF(MS_VSx86_DLL)\r
+*_ICCx86xASL_IA32_SLINK_DLL = DEF(VS2005x86_BIN)\r
*_ICCx86xASL_IA32_DLINK_PATH = DEF(ICC_BIN32x86)\xilink.exe\r
*_ICCx86xASL_IA32_PP_PATH = DEF(ICC_BIN32x86)\icl.exe\r
*_ICCx86xASL_IA32_VFRPP_PATH = DEF(ICC_BIN32x86)\icl.exe\r
*_ICCx86xASL_IA32_APP_PATH = DEF(ICC_BIN32x86)\icl.exe\r
-*_ICCx86xASL_IA32_ASM_PATH = DEF(MS_VSx86_BIN)\ml.exe\r
-*_ICCx86xASL_IA32_ASM_DLL = DEF(MS_VSx86_DLL)\r
+*_ICCx86xASL_IA32_ASM_PATH = DEF(VS2005x86_BIN)\ml.exe\r
+*_ICCx86xASL_IA32_ASM_DLL = DEF(VS2005x86_DLL)\r
*_ICCx86xASL_IA32_ASLCC_PATH = DEF(ICC_BIN32x86)\icl.exe\r
*_ICCx86xASL_IA32_ASLPP_PATH = DEF(ICC_BIN32x86)\icl.exe\r
*_ICCx86xASL_IA32_ASLDLINK_PATH = DEF(ICC_BIN32x86)\xilink.exe\r
*_ICCx86xASL_X64_CC_PATH = DEF(ICC_BINX64x86)\icl.exe\r
*_ICCx86xASL_X64_SLINK_PATH = DEF(ICC_BINX64x86)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
-*_ICCx86xASL_X64_SLINK_DLL = DEF(MS_VSx86_DLL)\r
+*_ICCx86xASL_X64_SLINK_DLL = DEF(VS2005x86_BIN)\r
*_ICCx86xASL_X64_DLINK_PATH = DEF(ICC_BINX64x86)\xilink.exe\r
*_ICCx86xASL_X64_PP_PATH = DEF(ICC_BINX64x86)\icl.exe\r
*_ICCx86xASL_X64_VFRPP_PATH = DEF(ICC_BINX64x86)\icl.exe\r
*_ICCx86xASL_X64_APP_PATH = DEF(ICC_BINX64x86)\icl.exe\r
*_ICCx86xASL_X64_ASM_PATH = DEF(WINDDK_BINX64)\ml64.exe\r
-*_ICCx86xASL_X64_ASM_DLL = DEF(MS_VSx86_DLL)\r
+*_ICCx86xASL_X64_ASM_DLL = DEF(VS2005x86_DLL)\r
*_ICCx86xASL_X64_ASLCC_PATH = DEF(ICC_BINX64x86)\icl.exe\r
*_ICCx86xASL_X64_ASLPP_PATH = DEF(ICC_BINX64x86)\icl.exe\r
*_ICCx86xASL_X64_ASLDLINK_PATH = DEF(ICC_BINX64x86)\xilink.exe\r
##################\r
*_ICCx86xASL_IPF_CC_PATH = DEF(ICC_BIN64x86)\icl.exe\r
# icl.exe needs cl.exe from Visual Studio\r
-*_ICCx86xASL_IPF_CC_DLL = DEF(MS_VSx86_DLL)\r
+*_ICCx86xASL_IPF_CC_DLL = DEF(VS2005x86_BIN)\r
*_ICCx86xASL_IPF_SLINK_PATH = DEF(ICC_BIN64x86)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
-*_ICCx86xASL_IPF_SLINK_DLL = DEF(MS_VSx86_DLL)\r
+*_ICCx86xASL_IPF_SLINK_DLL = DEF(VS2005x86_BIN);DEF(VS2005x86_DLL)\r
*_ICCx86xASL_IPF_DLINK_PATH = DEF(ICC_BIN64x86)\xilink.exe\r
*_ICCx86xASL_IPF_PP_PATH = DEF(ICC_BIN64x86)\icl.exe\r
*_ICCx86xASL_IPF_VFRPP_PATH = DEF(ICC_BIN64x86)\icl.exe\r
##################\r
*_ICCx86xASL_EBC_*_FAMILY = INTEL\r
\r
-*_ICCx86xASL_EBC_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe\r
+*_ICCx86xASL_EBC_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe\r
*_ICCx86xASL_EBC_PP_PATH = DEF(EBC_BINx86)\iec.exe\r
*_ICCx86xASL_EBC_VFRPP_PATH = DEF(EBC_BINx86)\iec.exe\r
*_ICCx86xASL_EBC_CC_PATH = DEF(EBC_BINx86)\iec.exe\r
*_ICC11_IA32_CC_PATH = DEF(ICC11_BIN32)\icl.exe\r
*_ICC11_IA32_SLINK_PATH = DEF(ICC11_BIN32)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
-*_ICC11_IA32_SLINK_DLL = DEF(MS_VS_DLL)\r
+*_ICC11_IA32_SLINK_DLL = DEF(MS_VS_BIN)\r
*_ICC11_IA32_DLINK_PATH = DEF(ICC11_BIN32)\xilink.exe\r
*_ICC11_IA32_PP_PATH = DEF(ICC11_BIN32)\icl.exe\r
*_ICC11_IA32_VFRPP_PATH = DEF(ICC11_BIN32)\icl.exe\r
*_ICC11_X64_CC_PATH = DEF(ICC11_BINX64)\icl.exe\r
*_ICC11_X64_SLINK_PATH = DEF(ICC11_BINX64)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
-*_ICC11_X64_SLINK_DLL = DEF(MS_VS_DLL)\r
+*_ICC11_X64_SLINK_DLL = DEF(MS_VS_BIN)\r
*_ICC11_X64_DLINK_PATH = DEF(ICC11_BINX64)\xilink.exe\r
*_ICC11_X64_PP_PATH = DEF(ICC11_BINX64)\icl.exe\r
*_ICC11_X64_VFRPP_PATH = DEF(ICC11_BINX64)\icl.exe\r
##################\r
*_ICC11_IPF_CC_PATH = DEF(ICC11_BIN64)\icl.exe\r
# icl.exe needs cl.exe from Visual Studio\r
-*_ICC11_IPF_CC_DLL = DEF(MS_VS_DLL)\r
+*_ICC11_IPF_CC_DLL = DEF(MS_VS_BIN)\r
*_ICC11_IPF_SLINK_PATH = DEF(ICC11_BIN64)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
*_ICC11_IPF_SLINK_DLL = DEF(MS_VS_BIN);DEF(MS_VS_DLL)\r
*_ICC11xASL_IA32_CC_PATH = DEF(ICC11_BIN32)\icl.exe\r
*_ICC11xASL_IA32_SLINK_PATH = DEF(ICC11_BIN32)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
-*_ICC11xASL_IA32_SLINK_DLL = DEF(MS_VS_DLL)\r
+*_ICC11xASL_IA32_SLINK_DLL = DEF(MS_VS_BIN)\r
*_ICC11xASL_IA32_DLINK_PATH = DEF(ICC11_BIN32)\xilink.exe\r
*_ICC11xASL_IA32_PP_PATH = DEF(ICC11_BIN32)\icl.exe\r
*_ICC11xASL_IA32_VFRPP_PATH = DEF(ICC11_BIN32)\icl.exe\r
*_ICC11xASL_X64_CC_PATH = DEF(ICC11_BINX64)\icl.exe\r
*_ICC11xASL_X64_SLINK_PATH = DEF(ICC11_BINX64)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
-*_ICC11xASL_X64_SLINK_DLL = DEF(MS_VS_DLL)\r
+*_ICC11xASL_X64_SLINK_DLL = DEF(MS_VS_BIN)\r
*_ICC11xASL_X64_DLINK_PATH = DEF(ICC11_BINX64)\xilink.exe\r
*_ICC11xASL_X64_PP_PATH = DEF(ICC11_BINX64)\icl.exe\r
*_ICC11xASL_X64_VFRPP_PATH = DEF(ICC11_BINX64)\icl.exe\r
##################\r
*_ICC11xASL_IPF_CC_PATH = DEF(ICC11_BIN64)\icl.exe\r
# icl.exe needs cl.exe from Visual Studio\r
-*_ICC11xASL_IPF_CC_DLL = DEF(MS_VS_DLL)\r
+*_ICC11xASL_IPF_CC_DLL = DEF(MS_VS_BIN)\r
*_ICC11xASL_IPF_SLINK_PATH = DEF(ICC11_BIN64)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
-*_ICC11xASL_IPF_SLINK_DLL = DEF(MS_VS_DLL)\r
+*_ICC11xASL_IPF_SLINK_DLL = DEF(MS_VS_BIN);DEF(MS_VS_DLL)\r
*_ICC11xASL_IPF_DLINK_PATH = DEF(ICC11_BIN64)\xilink.exe\r
*_ICC11xASL_IPF_PP_PATH = DEF(ICC11_BIN64)\icl.exe\r
*_ICC11xASL_IPF_VFRPP_PATH = DEF(ICC11_BIN64)\icl.exe\r
# ICC11x86 - Intel C Compiler V11.1\r
*_ICC11x86_*_*_FAMILY = INTEL\r
\r
-*_ICC11x86_*_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe\r
-*_ICC11x86_*_RC_PATH = DEF(MS_VSx86_BIN)\rc.exe\r
+*_ICC11x86_*_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe\r
+*_ICC11x86_*_RC_PATH = DEF(VS2005x86_BIN)\rc.exe\r
\r
*_ICC11x86_*_MAKE_FLAGS = /nologo\r
*_ICC11x86_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
*_ICC11x86_*_APP_FLAGS = /nologo /E /TC\r
*_ICC11x86_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h\r
\r
-*_ICC11x86_*_ASM16_PATH = DEF(MS_VSx86_BIN)\ml.exe\r
+*_ICC11x86_*_ASM16_PATH = DEF(VS2005x86_BIN)\ml.exe\r
\r
##################\r
# ASL definitions\r
*_ICC11x86_IA32_CC_PATH = DEF(ICC11_BIN32x86)\icl.exe\r
*_ICC11x86_IA32_SLINK_PATH = DEF(ICC11_BIN32x86)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
-*_ICC11x86_IA32_SLINK_DLL = DEF(MS_VSx86_DLL)\r
+*_ICC11x86_IA32_SLINK_DLL = DEF(VS2005x86_BIN)\r
*_ICC11x86_IA32_DLINK_PATH = DEF(ICC11_BIN32x86)\xilink.exe\r
*_ICC11x86_IA32_PP_PATH = DEF(ICC11_BIN32x86)\icl.exe\r
*_ICC11x86_IA32_VFRPP_PATH = DEF(ICC11_BIN32x86)\icl.exe\r
*_ICC11x86_IA32_APP_PATH = DEF(ICC11_BIN32x86)\icl.exe\r
-*_ICC11x86_IA32_ASM_PATH = DEF(MS_VSx86_BIN)\ml.exe\r
-*_ICC11x86_IA32_ASM_DLL = DEF(MS_VSx86_DLL)\r
+*_ICC11x86_IA32_ASM_PATH = DEF(VS2005x86_BIN)\ml.exe\r
+*_ICC11x86_IA32_ASM_DLL = DEF(VS2005x86_DLL)\r
*_ICC11x86_IA32_ASLCC_PATH = DEF(ICC11_BIN32x86)\icl.exe\r
*_ICC11x86_IA32_ASLPP_PATH = DEF(ICC11_BIN32x86)\icl.exe\r
*_ICC11x86_IA32_ASLDLINK_PATH = DEF(ICC11_BIN32x86)\xilink.exe\r
*_ICC11x86_X64_CC_PATH = DEF(ICC11_BINX64x86)\icl.exe\r
*_ICC11x86_X64_SLINK_PATH = DEF(ICC11_BINX64x86)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
-*_ICC11x86_X64_SLINK_DLL = DEF(MS_VSx86_DLL)\r
+*_ICC11x86_X64_SLINK_DLL = DEF(VS2005x86_BIN)\r
*_ICC11x86_X64_DLINK_PATH = DEF(ICC11_BINX64x86)\xilink.exe\r
*_ICC11x86_X64_PP_PATH = DEF(ICC11_BINX64x86)\icl.exe\r
*_ICC11x86_X64_VFRPP_PATH = DEF(ICC11_BINX64x86)\icl.exe\r
*_ICC11x86_X64_APP_PATH = DEF(ICC11_BINX64x86)\icl.exe\r
*_ICC11x86_X64_ASM_PATH = DEF(WINDDK_BINX64)\ml64.exe\r
-*_ICC11x86_X64_ASM_DLL = DEF(MS_VSx86_DLL)\r
+*_ICC11x86_X64_ASM_DLL = DEF(VS2005x86_DLL)\r
*_ICC11x86_X64_ASLCC_PATH = DEF(ICC11_BINX64x86)\icl.exe\r
*_ICC11x86_X64_ASLPP_PATH = DEF(ICC11_BINX64x86)\icl.exe\r
*_ICC11x86_X64_ASLDLINK_PATH = DEF(ICC11_BINX64x86)\xilink.exe\r
##################\r
*_ICC11x86_IPF_CC_PATH = DEF(ICC11_BIN64x86)\icl.exe\r
# icl.exe needs cl.exe from Visual Studio\r
-*_ICC11x86_IPF_CC_DLL = DEF(MS_VSx86_DLL)\r
+*_ICC11x86_IPF_CC_DLL = DEF(VS2005x86_BIN)\r
*_ICC11x86_IPF_SLINK_PATH = DEF(ICC11_BIN64x86)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
-*_ICC11x86_IPF_SLINK_DLL = DEF(MS_VSx86_DLL)\r
+*_ICC11x86_IPF_SLINK_DLL = DEF(VS2005x86_BIN);DEF(VS2005x86_DLL)\r
*_ICC11x86_IPF_DLINK_PATH = DEF(ICC11_BIN64x86)\xilink.exe\r
*_ICC11x86_IPF_PP_PATH = DEF(ICC11_BIN64x86)\icl.exe\r
*_ICC11x86_IPF_VFRPP_PATH = DEF(ICC11_BIN64x86)\icl.exe\r
##################\r
*_ICC11x86_EBC_*_FAMILY = INTEL\r
\r
-*_ICC11x86_EBC_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe\r
+*_ICC11x86_EBC_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe\r
*_ICC11x86_EBC_PP_PATH = DEF(EBC_BINx86)\iec.exe\r
*_ICC11x86_EBC_VFRPP_PATH = DEF(EBC_BINx86)\iec.exe\r
*_ICC11x86_EBC_CC_PATH = DEF(EBC_BINx86)\iec.exe\r
# ICC11x86xASL - Intel C Compiler V11.1\r
*_ICC11x86xASL_*_*_FAMILY = INTEL\r
\r
-*_ICC11x86xASL_*_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe\r
-*_ICC11x86xASL_*_RC_PATH = DEF(MS_VSx86_BIN)\rc.exe\r
+*_ICC11x86xASL_*_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe\r
+*_ICC11x86xASL_*_RC_PATH = DEF(VS2005x86_BIN)\rc.exe\r
\r
*_ICC11x86xASL_*_MAKE_FLAGS = /nologo\r
*_ICC11x86xASL_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
*_ICC11x86xASL_*_APP_FLAGS = /nologo /E /TC\r
*_ICC11x86xASL_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h\r
\r
-*_ICC11x86xASL_*_ASM16_PATH = DEF(MS_VSx86_BIN)\ml.exe\r
+*_ICC11x86xASL_*_ASM16_PATH = DEF(VS2005x86_BIN)\ml.exe\r
\r
##################\r
# ASL definitions\r
*_ICC11x86xASL_IA32_CC_PATH = DEF(ICC11_BIN32x86)\icl.exe\r
*_ICC11x86xASL_IA32_SLINK_PATH = DEF(ICC11_BIN32x86)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
-*_ICC11x86xASL_IA32_SLINK_DLL = DEF(MS_VSx86_DLL)\r
+*_ICC11x86xASL_IA32_SLINK_DLL = DEF(VS2005x86_BIN)\r
*_ICC11x86xASL_IA32_DLINK_PATH = DEF(ICC11_BIN32x86)\xilink.exe\r
*_ICC11x86xASL_IA32_PP_PATH = DEF(ICC11_BIN32x86)\icl.exe\r
*_ICC11x86xASL_IA32_VFRPP_PATH = DEF(ICC11_BIN32x86)\icl.exe\r
*_ICC11x86xASL_IA32_APP_PATH = DEF(ICC11_BIN32x86)\icl.exe\r
-*_ICC11x86xASL_IA32_ASM_PATH = DEF(MS_VSx86_BIN)\ml.exe\r
-*_ICC11x86xASL_IA32_ASM_DLL = DEF(MS_VSx86_DLL)\r
+*_ICC11x86xASL_IA32_ASM_PATH = DEF(VS2005x86_BIN)\ml.exe\r
+*_ICC11x86xASL_IA32_ASM_DLL = DEF(VS2005x86_DLL)\r
*_ICC11x86xASL_IA32_ASLCC_PATH = DEF(ICC11_BIN32x86)\icl.exe\r
*_ICC11x86xASL_IA32_ASLPP_PATH = DEF(ICC11_BIN32x86)\icl.exe\r
*_ICC11x86xASL_IA32_ASLDLINK_PATH = DEF(ICC11_BIN32x86)\xilink.exe\r
*_ICC11x86xASL_X64_CC_PATH = DEF(ICC11_BINX64x86)\icl.exe\r
*_ICC11x86xASL_X64_SLINK_PATH = DEF(ICC11_BINX64x86)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
-*_ICC11x86xASL_X64_SLINK_DLL = DEF(MS_VSx86_DLL)\r
+*_ICC11x86xASL_X64_SLINK_DLL = DEF(VS2005x86_BIN)\r
*_ICC11x86xASL_X64_DLINK_PATH = DEF(ICC11_BINX64x86)\xilink.exe\r
*_ICC11x86xASL_X64_PP_PATH = DEF(ICC11_BINX64x86)\icl.exe\r
*_ICC11x86xASL_X64_VFRPP_PATH = DEF(ICC11_BINX64x86)\icl.exe\r
*_ICC11x86xASL_X64_APP_PATH = DEF(ICC11_BINX64x86)\icl.exe\r
*_ICC11x86xASL_X64_ASM_PATH = DEF(WINDDK_BINX64)\ml64.exe\r
-*_ICC11x86xASL_X64_ASM_DLL = DEF(MS_VSx86_DLL)\r
+*_ICC11x86xASL_X64_ASM_DLL = DEF(VS2005x86_DLL)\r
*_ICC11x86xASL_X64_ASLCC_PATH = DEF(ICC11_BINX64x86)\icl.exe\r
*_ICC11x86xASL_X64_ASLPP_PATH = DEF(ICC11_BINX64x86)\icl.exe\r
*_ICC11x86xASL_X64_ASLDLINK_PATH = DEF(ICC11_BINX64x86)\xilink.exe\r
##################\r
*_ICC11x86xASL_IPF_CC_PATH = DEF(ICC11_BIN64x86)\icl.exe\r
# icl.exe needs cl.exe from Visual Studio\r
-*_ICC11x86xASL_IPF_CC_DLL = DEF(MS_VSx86_DLL)\r
+*_ICC11x86xASL_IPF_CC_DLL = DEF(VS2005x86_BIN)\r
*_ICC11x86xASL_IPF_SLINK_PATH = DEF(ICC11_BIN64x86)\xilib.exe\r
# xilib.exe needs lib.exe from Visual Studio\r
-*_ICC11x86xASL_IPF_SLINK_DLL = DEF(MS_VSx86_DLL)\r
+*_ICC11x86xASL_IPF_SLINK_DLL = DEF(VS2005x86_BIN);DEF(VS2005x86_DLL)\r
*_ICC11x86xASL_IPF_DLINK_PATH = DEF(ICC11_BIN64x86)\xilink.exe\r
*_ICC11x86xASL_IPF_PP_PATH = DEF(ICC11_BIN64x86)\icl.exe\r
*_ICC11x86xASL_IPF_VFRPP_PATH = DEF(ICC11_BIN64x86)\icl.exe\r
##################\r
*_ICC11x86xASL_EBC_*_FAMILY = INTEL\r
\r
-*_ICC11x86xASL_EBC_MAKE_PATH = DEF(MS_VSx86_BIN)\nmake.exe\r
+*_ICC11x86xASL_EBC_MAKE_PATH = DEF(VS2005x86_BIN)\nmake.exe\r
*_ICC11x86xASL_EBC_PP_PATH = DEF(EBC_BINx86)\iec.exe\r
*_ICC11x86xASL_EBC_VFRPP_PATH = DEF(EBC_BINx86)\iec.exe\r
*_ICC11x86xASL_EBC_CC_PATH = DEF(EBC_BINx86)\iec.exe\r
##################\r
*_MYTOOLS_EBC_*_FAMILY = INTEL\r
\r
-*_MYTOOLS_EBC_MAKE_PATH = DEF(VS2008_BIN)\nmake.exe\r
+*_MYTOOLS_EBC_MAKE_PATH = DEF(VS2005_BIN)\nmake.exe\r
*_MYTOOLS_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe\r
*_MYTOOLS_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe\r
*_MYTOOLS_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe\r
*_MYTOOLS_EBC_SLINK_PATH = DEF(EBC_BIN)\link.exe\r
*_MYTOOLS_EBC_DLINK_PATH = DEF(EBC_BIN)\link.exe\r
-*_MYTOOLS_EBC_RC_PATH = DEF(VS2008_BIN)\rc.exe\r
+*_MYTOOLS_EBC_RC_PATH = DEF(VS2005_BIN)\rc.exe\r
\r
*_MYTOOLS_EBC_MAKE_FLAGS = /nologo\r
*_MYTOOLS_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h\r