Changed the default directory of VS2005TEAMSTUIE to the default installation director...

[mirror_edk2.git] / BaseTools / Conf / tools_def.template

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 08d52ba8b5a62631c5b50e13638ed3bd2444153b..f9ad478d0e7610b5a16dabe08e56998154b6eb3a 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -25,12 +25,14 @@ DEFINE VS2005EXP_DLL = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE
 DEFINE VS2005STD_BIN = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
 DEFINE VS2005STD_DLL = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
 \r
-DEFINE VS2005PRO_BIN = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
+DEFINE VS2005PRO_BIN    = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
 DEFINE VS2005PRO_BINX64 = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_amd64\r
-DEFINE VS2005PRO_DLL = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
+DEFINE VS2005PRO_DLL    = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
 \r
-DEFINE VS2005TS_BIN  = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
-DEFINE VS2005TS_DLL  = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
+DEFINE VS2005TEAMSUITE_BIN    = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
+DEFINE VS2005TEAMSUITE_BINX64 = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_amd64\r
+DEFINE VS2005TEAMSUITE_BIN64  = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_ia64\r
+DEFINE VS2005TEAMSUITE_DLL    = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
 \r
 DEFINE WINDDK_BIN16   = C:\WINDDK\3790.1830\bin\bin16\r
 DEFINE WINDDK_BIN32   = C:\WINDDK\3790.1830\bin\x86\r
@@ -152,9 +154,10 @@ RELEASE_VS2003_IA32_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_VS2005PRO_*_TIANO_PATH            = TianoCompress.exe\r
 *_VS2005PRO_*_TIANO_GUID                 = A31280AD-481E-41B6-95E8-127F4C984779\r
 \r
-*_VS2005PRO_*_ASL_PATH               = DEF(ASL_BIN)\iasl.exe\r
-\r
+*_VS2005PRO_*_ASL_PATH              = DEF(ASL_BIN)\iasl.exe\r
+*_VS2005PRO_*_MAKE_PATH             = DEF(VS2005PRO_BIN)\nmake.exe\r
 \r
+*_VS2005PRO_*_MAKE_FLAGS                 = /nologo\r
 *_VS2005PRO_*_SLINK_FLAGS                = /NOLOGO /LTCG\r
 *_VS2005PRO_*_APP_FLAGS                  = /nologo /E /TC\r
 *_VS2005PRO_*_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h\r
@@ -164,7 +167,6 @@ RELEASE_VS2003_IA32_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ##################\r
 *_VS2005PRO_IA32_*_DLL              = DEF(VS2005PRO_DLL)\r
 \r
-*_VS2005PRO_IA32_MAKE_PATH          = DEF(VS2005PRO_BIN)\nmake.exe\r
 *_VS2005PRO_IA32_CC_PATH            = DEF(VS2005PRO_BIN)\cl.exe\r
 *_VS2005PRO_IA32_VFRPP_PATH         = DEF(VS2005PRO_BIN)\cl.exe\r
 *_VS2005PRO_IA32_SLINK_PATH         = DEF(VS2005PRO_BIN)\lib.exe\r
@@ -174,7 +176,6 @@ RELEASE_VS2003_IA32_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_VS2005PRO_IA32_PP_PATH            = DEF(VS2005PRO_BIN)\cl.exe\r
 *_VS2005PRO_IA32_ASM_PATH           = DEF(VS2005PRO_BIN)\ml.exe\r
 \r
-     *_VS2005PRO_IA32_MAKE_FLAGS         = /nologo\r
   DEBUG_VS2005PRO_IA32_CC_FLAGS          = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
 RELEASE_VS2005PRO_IA32_CC_FLAGS          = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 \r
   DEBUG_VS2005PRO_IA32_ASM_FLAGS         = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi  \r
@@ -204,6 +205,87 @@ RELEASE_VS2005PRO_X64_ASM_FLAGS          = /nologo /W3 /WX /c /Cx /Zd
   DEBUG_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
 RELEASE_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
 \r
+####################################################################################\r
+#   VS2005TEAMSUITE           - Microsoft Visual Studio 2005 Team Suite Edition\r
+*_VS2005TEAMSUITE_*_*_FAMILY        = MSFT\r
+\r
+*_VS2005TEAMSUITE_*_TIANO_PATH      = TianoCompress.exe\r
+*_VS2005TEAMSUITE_*_TIANO_GUID           = A31280AD-481E-41B6-95E8-127F4C984779\r
+\r
+*_VS2005TEAMSUITE_*_ASL_PATH        = DEF(ASL_BIN)\iasl.exe\r
+*_VS2005TEAMSUITE_*_MAKE_PATH       = DEF(VS2005TEAMSUITE_BIN)\nmake.exe\r
+\r
+\r
+*_VS2005TEAMSUITE_*_MAKE_FLAGS           = /nologo\r
+*_VS2005TEAMSUITE_*_SLINK_FLAGS          = /NOLOGO /LTCG\r
+*_VS2005TEAMSUITE_*_APP_FLAGS            = /nologo /E /TC\r
+*_VS2005TEAMSUITE_*_PP_FLAGS             = /nologo /E /TC /FIAutoGen.h\r
+*_VS2005TEAMSUITE_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+##################\r
+# IA32 definitions\r
+##################\r
+*_VS2005TEAMSUITE_IA32_*_DLL        = DEF(VS2005TEAMSUITE_DLL)\r
+\r
+*_VS2005TEAMSUITE_IA32_MAKE_PATH    = DEF(VS2005TEAMSUITE_BIN)\nmake.exe\r
+*_VS2005TEAMSUITE_IA32_CC_PATH      = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
+*_VS2005TEAMSUITE_IA32_VFRPP_PATH   = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
+*_VS2005TEAMSUITE_IA32_SLINK_PATH   = DEF(VS2005TEAMSUITE_BIN)\lib.exe\r
+*_VS2005TEAMSUITE_IA32_DLINK_PATH   = DEF(VS2005TEAMSUITE_BIN)\link.exe\r
+*_VS2005TEAMSUITE_IA32_ASMLINK_PATH = DEF(VS2005TEAMSUITE_BIN)\link.exe\r
+*_VS2005TEAMSUITE_IA32_APP_PATH     = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
+*_VS2005TEAMSUITE_IA32_PP_PATH      = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
+*_VS2005TEAMSUITE_IA32_ASM_PATH     = DEF(VS2005TEAMSUITE_BIN)\ml.exe\r
+\r
+      *_VS2005TEAMSUITE_IA32_MAKE_FLAGS  = /nologo\r
+  DEBUG_VS2005TEAMSUITE_IA32_CC_FLAGS    = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
+RELEASE_VS2005TEAMSUITE_IA32_CC_FLAGS    = /GS- /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 \r
+  DEBUG_VS2005TEAMSUITE_IA32_ASM_FLAGS   = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi  \r
+RELEASE_VS2005TEAMSUITE_IA32_ASM_FLAGS   = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
+  DEBUG_VS2005TEAMSUITE_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG   \r
+RELEASE_VS2005TEAMSUITE_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+      *_VS2005TEAMSUITE_IA32_ASMLINK_FLAGS= /link /nologo /tiny\r
+\r
+##################\r
+# X64 definitions\r
+##################\r
+*_VS2005TEAMSUITE_X64_*_DLL         = DEF(VS2005TEAMSUITE_DLL)\r
+\r
+*_VS2005TEAMSUITE_X64_CC_PATH       = DEF(VS2005TEAMSUITE_BINX64)\cl.exe\r
+*_VS2005TEAMSUITE_X64_PP_PATH       = DEF(VS2005TEAMSUITE_BINX64)\cl.exe\r
+*_VS2005TEAMSUITE_X64_APP_PATH      = DEF(VS2005TEAMSUITE_BINX64)\cl.exe\r
+*_VS2005TEAMSUITE_X64_VFRPP_PATH    = DEF(VS2005TEAMSUITE_BINX64)\cl.exe\r
+*_VS2005TEAMSUITE_X64_ASM_PATH      = DEF(VS2005TEAMSUITE_BINX64)\ml64.exe\r
+*_VS2005TEAMSUITE_X64_SLINK_PATH    = DEF(VS2005TEAMSUITE_BINX64)\lib.exe\r
+*_VS2005TEAMSUITE_X64_DLINK_PATH    = DEF(VS2005TEAMSUITE_BINX64)\link.exe\r
+*_VS2005TEAMSUITE_X64_ASMLINK_PATH  = DEF(VS2005TEAMSUITE_BINX64)\link.exe\r
+\r
+  DEBUG_VS2005TEAMSUITE_X64_CC_FLAGS     = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GF /Zi /Gm \r
+RELEASE_VS2005TEAMSUITE_X64_CC_FLAGS     = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GF\r
+  DEBUG_VS2005TEAMSUITE_X64_ASM_FLAGS    = /nologo /W3 /WX /c /Cx /Zd /Zi\r
+RELEASE_VS2005TEAMSUITE_X64_ASM_FLAGS    = /nologo /W3 /WX /c /Cx /Zd\r
+  DEBUG_VS2005TEAMSUITE_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+RELEASE_VS2005TEAMSUITE_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+\r
+##################\r
+# IPF definitions\r
+##################\r
+*_VS2005TEAMSUITE_IPF_*_DLL         = DEF(VS2005TEAMSUITE_DLL)\r
+\r
+*_VS2005TEAMSUITE_IPF_PP_PATH       = DEF(VS2005TEAMSUITE_BIN64)\cl.exe\r
+*_VS2005TEAMSUITE_IPF_APP_PATH      = DEF(VS2005TEAMSUITE_BIN64)\cl.exe\r
+*_VS2005TEAMSUITE_IPF_VFRPP_PATH    = DEF(VS2005TEAMSUITE_BIN64)\cl.exe\r
+*_VS2005TEAMSUITE_IPF_CC_PATH       = DEF(VS2005TEAMSUITE_BIN64)\cl.exe\r
+*_VS2005TEAMSUITE_IPF_ASM_PATH      = DEF(VS2005TEAMSUITE_BIN64)\ias.exe\r
+*_VS2005TEAMSUITE_IPF_SLINK_PATH    = DEF(VS2005TEAMSUITE_BIN64)\lib.exe\r
+*_VS2005TEAMSUITE_IPF_DLINK_PATH    = DEF(VS2005TEAMSUITE_BIN64)\link.exe\r
+\r
+  DEBUG_VS2005TEAMSUITE_IPF_CC_FLAGS     = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FIAutoGen.h /Zi\r
+RELEASE_VS2005TEAMSUITE_IPF_CC_FLAGS     = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FIAutoGen.h \r
+  DEBUG_VS2005TEAMSUITE_IPF_ASM_FLAGS    = -N us -X explicit -M ilp64 -N so -W4 -d debug\r
+RELEASE_VS2005TEAMSUITE_IPF_ASM_FLAGS    = -N us -X explicit -M ilp64 -N so -W4\r
+  DEBUG_VS2005TEAMSUITE_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /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_VS2005TEAMSUITE_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /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
 #\r
 # Microsoft Device Driver Kit 3790.1830 (IA-32, X64, Itanium, with Link Time Code Generation)\r
@@ -212,6 +294,9 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 #   WINDDK3790x1830  - Microsoft Windows DDK 3790.1830\r
 *_WINDDK3790x1830_*_*_FAMILY        = MSFT\r
 \r
+*_WINDDK3790x1830_*_MAKE_PATH       = DEF(WINDDK_BIN32)\nmake.exe\r
+*_WINDDK3790x1830_*_MAKE_FLAGS           = /nologo\r
+\r
 *_WINDDK3790x1830_*_PP_FLAGS             = /nologo /E /TC /FIAutoGen.h\r
 *_WINDDK3790x1830_*_APP_FLAGS            = /nologo /E /TC\r
 *_WINDDK3790x1830_*_SLINK_FLAGS          = /nologo /LTCG\r
@@ -248,15 +333,15 @@ RELEASE_WINDDK3790x1830_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ##################\r
 # x64 definitions\r
 ##################\r
-*_WINDDK3790x1830_IA32_CC_PATH      = DEF(WINDDK_BINX64)\cl.exe\r
-*_WINDDK3790x1830_IA32_SLINK_PATH   = DEF(WINDDK_BINX64)\lib.exe\r
-*_WINDDK3790x1830_IA32_DLINK_PATH   = DEF(WINDDK_BINX64)\link.exe\r
-*_WINDDK3790x1830_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe\r
-*_WINDDK3790x1830_IA32_PP_PATH      = DEF(WINDDK_BINX64)\cl.exe\r
-*_WINDDK3790x1830_IA32_VFRPP_PATH   = DEF(WINDDK_BINX64)\cl.exe\r
-*_WINDDK3790x1830_IA32_APP_PATH     = DEF(WINDDK_BINX64)\cl.exe\r
-*_WINDDK3790x1830_IA32_PCH_PATH     = DEF(WINDDK_BINX64)\cl.exe\r
-*_WINDDK3790x1830_IA32_ASM_PATH     = DEF(WINDDK_BINX64)\ml64.exe\r
+*_WINDDK3790x1830_X64_CC_PATH      = DEF(WINDDK_BINX64)\cl.exe\r
+*_WINDDK3790x1830_X64_SLINK_PATH   = DEF(WINDDK_BINX64)\lib.exe\r
+*_WINDDK3790x1830_X64_DLINK_PATH   = DEF(WINDDK_BINX64)\link.exe\r
+*_WINDDK3790x1830_X64_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe\r
+*_WINDDK3790x1830_X64_PP_PATH      = DEF(WINDDK_BINX64)\cl.exe\r
+*_WINDDK3790x1830_X64_VFRPP_PATH   = DEF(WINDDK_BINX64)\cl.exe\r
+*_WINDDK3790x1830_X64_APP_PATH     = DEF(WINDDK_BINX64)\cl.exe\r
+*_WINDDK3790x1830_X64_PCH_PATH     = DEF(WINDDK_BINX64)\cl.exe\r
+*_WINDDK3790x1830_X64_ASM_PATH     = DEF(WINDDK_BINX64)\ml64.exe\r
 \r
   DEBUG_WINDDK3790x1830_X64_CC_FLAGS     = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /Zi /Gm /EHs-c- /GF\r
 RELEASE_WINDDK3790x1830_X64_CC_FLAGS     = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GF\r
@@ -270,15 +355,15 @@ RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ##################\r
 # IPF definitions\r
 ##################\r
-*_WINDDK3790x1830_IA32_CC_PATH      = DEF(WINDDK_BIN64)\cl.exe\r
-*_WINDDK3790x1830_IA32_SLINK_PATH   = DEF(WINDDK_BIN64)\lib.exe\r
-*_WINDDK3790x1830_IA32_DLINK_PATH   = DEF(WINDDK_BIN64)\link.exe\r
-*_WINDDK3790x1830_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe\r
-*_WINDDK3790x1830_IA32_PP_PATH      = DEF(WINDDK_BIN64)\cl.exe\r
-*_WINDDK3790x1830_IA32_VFRPP_PATH   = DEF(WINDDK_BIN64)\cl.exe\r
-*_WINDDK3790x1830_IA32_APP_PATH     = DEF(WINDDK_BIN64)\cl.exe\r
-*_WINDDK3790x1830_IA32_PCH_PATH     = DEF(WINDDK_BIN64)\cl.exe\r
-*_WINDDK3790x1830_IPF_ASM_PATH      = DEF(WINDDK_BIN64)\ias.exe\r
+*_WINDDK3790x1830_IPF_CC_PATH      = DEF(WINDDK_BIN64)\cl.exe\r
+*_WINDDK3790x1830_IPF_SLINK_PATH   = DEF(WINDDK_BIN64)\lib.exe\r
+*_WINDDK3790x1830_IPF_DLINK_PATH   = DEF(WINDDK_BIN64)\link.exe\r
+*_WINDDK3790x1830_IPF_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe\r
+*_WINDDK3790x1830_IPF_PP_PATH      = DEF(WINDDK_BIN64)\cl.exe\r
+*_WINDDK3790x1830_IPF_VFRPP_PATH   = DEF(WINDDK_BIN64)\cl.exe\r
+*_WINDDK3790x1830_IPF_APP_PATH     = DEF(WINDDK_BIN64)\cl.exe\r
+*_WINDDK3790x1830_IPF_PCH_PATH     = DEF(WINDDK_BIN64)\cl.exe\r
+*_WINDDK3790x1830_IPF_ASM_PATH     = DEF(WINDDK_BIN64)\ias.exe\r
 \r
   DEBUG_WINDDK3790x1830_IPF_CC_FLAGS     = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FIAutoGen.h /Zi\r
 RELEASE_WINDDK3790x1830_IPF_CC_FLAGS     = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Os /GL /X /FIAutoGen.h\r
@@ -354,7 +439,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 \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_*_ASM_FLAGS                  = -c -x assembler -imacros AutoGen.h\r
 *_CYGWINGCC_*_PP_FLAGS                   = -E -x assembler-with-cpp -include AutoGen.h\r
 *_CYGWINGCC_*_VFRPP_FLAGS                = -x c -E -P -DVFRCOMPILE --include AutoGen.h\r
 \r
@@ -492,6 +577,8 @@ RELEASE_ICC_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_ICC_X64_PCH_PATH                  = DEF(ICC_BINX64)\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(VSNET2003_BIN)\r
 *_ICC_X64_DLINK_PATH                = DEF(ICC_BINX64)\xilink.exe\r
 *_ICC_X64_ASMLINK_PATH              = DEF(ICC_BINX64)\xilink.exe\r
 *_ICC_X64_PP_PATH                   = DEF(ICC_BINX64)\icl.exe\r
@@ -515,7 +602,11 @@ RELEASE_ICC_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 # IPF definitions\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(VSNET2003_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(VSNET2003_BIN);DEF(VSNET2003_DLL)\r
 *_ICC_IPF_DLINK_PATH                = DEF(ICC_BIN64)\xilink.exe\r
 *_ICC_IPF_ASMLINK_PATH              = DEF(ICC_BIN64)\xilink.exe\r
 *_ICC_IPF_PP_PATH                   = DEF(ICC_BIN64)\icl.exe\r