Added MAKE command for ICC and CYGWINGCC tool chain

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4095 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 8f722311114e9710351d7001182f0f529ac09a1b..08d52ba8b5a62631c5b50e13638ed3bd2444153b 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -350,7 +350,9 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 \r
 *_CYGWINGCC_*_*_DPATH               = DEF(CYGWIN_BIN)\r
 *_CYGWINGCC_*_ASL_PATH              = DEF(ASL_BIN)/iasl.exe\r
+*_CYGWINGCC_*_MAKE_PATH             = DEF(VSNET2003_BIN)\nmake.exe\r
 \r
+*_CYGWINGCC_*_MAKE_FLAGS                 = /nologo\r
 *_CYGWINGCC_*_DLINK_FLAGS                = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _$(ENTRYPOINT) --file-alignment 0x20 --section-alignment 0x20\r
 *_CYGWINGCC_*_ASM_FLAGS                  = -c -imacros AutoGen.h\r
 *_CYGWINGCC_*_PP_FLAGS                   = -E -x assembler-with-cpp -include AutoGen.h\r
@@ -451,7 +453,9 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_ICC_*_*_FAMILY                    = INTEL\r
 \r
 *_ICC_*_ASL_PATH                    = DEF(ASL_BIN)\iasl.exe\r
+*_ICC_*_MAKE_PATH                   = DEF(VSNET2003_BIN)\nmake.exe\r
 \r
+*_ICC_*_MAKE_FLAGS                       = /nologo\r
 *_ICC_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
 *_ICC_*_APP_FLAGS                        = /nologo /E /TC\r
 *_ICC_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h\r
@@ -462,6 +466,8 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_ICC_IA32_PCH_PATH                 = DEF(ICC_BIN32)\icl.exe\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(VSNET2003_BIN)\r
 *_ICC_IA32_DLINK_PATH               = DEF(ICC_BIN32)\xilink.exe\r
 *_ICC_IA32_ASMLINK_PATH             = DEF(ICC_BIN32)\xilink.exe\r
 *_ICC_IA32_PP_PATH                  = DEF(ICC_BIN32)\icl.exe\r