Corrected the wrong ARCH in WINDDK3790x1830 tool chain and added MAKE command for it.

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

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 08d52ba8b5a62631c5b50e13638ed3bd2444153b..edf32ed5fbb654ded08397ebf5aa34e17e7bcace 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -212,6 +212,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 +251,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 +273,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