From cba02989d1d7849e2e652ac5d8f350c1706275a2 Mon Sep 17 00:00:00 2001 From: jwang36 Date: Fri, 12 Oct 2007 03:36:32 +0000 Subject: [PATCH] Added DLL attribute for SLINK and/or CC command because Intel Compiler and linker need the cl.exe and lib.exe from Visual Studio. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4106 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Conf/tools_def.template | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index edf32ed5fb..f2ffd50951 100644 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -495,6 +495,8 @@ RELEASE_ICC_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O *_ICC_X64_PCH_PATH = DEF(ICC_BINX64)\icl.exe *_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(VSNET2003_BIN) *_ICC_X64_DLINK_PATH = DEF(ICC_BINX64)\xilink.exe *_ICC_X64_ASMLINK_PATH = DEF(ICC_BINX64)\xilink.exe *_ICC_X64_PP_PATH = DEF(ICC_BINX64)\icl.exe @@ -518,7 +520,11 @@ RELEASE_ICC_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O # IPF definitions ################## *_ICC_IPF_CC_PATH = DEF(ICC_BIN64)\icl.exe +# icl.exe needs cl.exe from Visual Studio +*_ICC_IPF_CC_DLL = DEF(VSNET2003_BIN) *_ICC_IPF_SLINK_PATH = DEF(ICC_BIN64)\xilib.exe +# xilib.exe needs lib.exe from Visual Studio +*_ICC_IPF_SLINK_DLL = DEF(VSNET2003_BIN);DEF(VSNET2003_DLL) *_ICC_IPF_DLINK_PATH = DEF(ICC_BIN64)\xilink.exe *_ICC_IPF_ASMLINK_PATH = DEF(ICC_BIN64)\xilink.exe *_ICC_IPF_PP_PATH = DEF(ICC_BIN64)\icl.exe