X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FConf%2Ftools_def.template;h=8e3ef2ea75d9a8d8d227850b83ad2e34e7722289;hp=ea5f40668be0a9a6c30d1f98709ec1d185f83ac9;hb=a9b19265acc4c8348adaebdcdc26056ad5f101d9;hpb=7d1142bfea6aa2bb74ab17da0f7e6712966901db

diff --git a/Tools/Conf/tools_def.template b/Tools/Conf/tools_def.template
index ea5f40668b..8e3ef2ea75 100644
--- a/Tools/Conf/tools_def.template
+++ b/Tools/Conf/tools_def.template
@@ -1,16 +1,16 @@
 # format: TARGET_TOOLCHAIN_ARCH_COMMANDTYPE_ATTRIBUTE = <string>
 
 #Default values
-*_MSFT_*_*_FAMILY = MSFT
-*_MSFT_*_ASL_FAMILY = INTEL
+*_MSFT_*_*_FAMILY       = MSFT
+*_MSFT_*_ASL_FAMILY     = INTEL
 
-*_MSFT_*_CC_NAME = cl.exe
-*_MSFT_*_SLINK_NAME = lib.exe
-*_MSFT_*_DLINK_NAME = link.exe
-*_MSFT_*_ASM_NAME = ml.exe
-*_MSFT_*_ASMLINK_NAME = link.exe
-*_MSFT_*_ASL_NAME = iasl.exe
-*_MSFT_*_PP_NAME = cl.exe
+*_MSFT_*_CC_NAME        = cl.exe
+*_MSFT_*_SLINK_NAME     = lib.exe
+*_MSFT_*_DLINK_NAME     = link.exe
+*_MSFT_*_ASM_NAME       = ml.exe
+*_MSFT_*_ASMLINK_NAME   = link.exe
+*_MSFT_*_ASL_NAME       = iasl.exe
+*_MSFT_*_PP_NAME        = cl.exe
 
 # HOST definitions
 #*_MSFT_HOST_*_PATH = C:\Program Files\Intel\Compiler\C++\9.0\IA32\Bin
@@ -19,42 +19,44 @@
 
 # IA32 definitions
 *_MSFT_IA32_*_PATH       = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin
-*_MSFT_IA32_ASM_PATH     = C:\TianoTools\Bin\Ia32\Masm611\BIN
-*_MSFT_IA32_ASMLINK_PATH = C:\TianoTools\Bin\Ia32\Masm611\BINR
+*_MSFT_IA32_ASM_PATH     = C:\Masm611\BIN
+*_MSFT_IA32_ASMLINK_PATH = C:\WINDDK\3790.1830\Bin\Bin16\
 *_MSFT_IA32_ASL_PATH     = C:\TianoTools\Bin
 *_MSFT_IA32_*_DPATH      = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE
 #*_MSFT_IA32_ASM_EXT     = .asm
 
-# DEBUG_MSFT_IA32_CC_PATH = 
-
 # x64 definitions
 *_MSFT_X64_*_PATH       = C:\WINDDK\3790.1830\bin\win64\x86\amd64
-*_MSFT_X64_ASMLINK_PATH = C:\TianoTools\Bin\Ia32\Masm611\BINR
+*_MSFT_X64_ASMLINK_PATH = C:\WINDDK\3790.1830\Bin\Bin16\
 *_MSFT_X64_ASL_PATH     = C:\TianoTools\Bin
-*_MSFT_X64_ASM_NAME = ml64.exe
-*_MSFT_X64_ASM_EXT  = .asm
-
+*_MSFT_X64_ASM_NAME     = ml64.exe
+*_MSFT_X64_ASM_EXT      = .asm
 
 # IPF definitions
-*_MSFT_IPF_*_PATH = C:\WINDDK\3790.1830\bin\win64\x86
-*_MSFT_IPF_ASM_NAME = ias.exe
+*_MSFT_IPF_*_PATH       = C:\WINDDK\3790.1830\bin\win64\x86
+*_MSFT_IPF_ASM_NAME     = ias.exe
 
 # EBC definitions
-*_MSFT_EBC_*_FAMILY = INTEL
-*_MSFT_EBC_*_PATH = C:\Program Files\Intel\EBC\Bin
-*_MSFT_EBC_*_SPATH = C:\Program Files\Intel\EBC\Lib\EbcLib.lib
-*_MSFT_EBC_CC_NAME = iec.exe
-*_MSFT_EBC_SLINK_NAME = link.exe
+*_MSFT_EBC_*_FAMILY     = INTEL
+*_MSFT_EBC_*_PATH       = C:\Program Files\Intel\EBC\Bin
+*_MSFT_EBC_*_SPATH      = C:\Progra~1\Intel\EBC\Lib\EbcLib.lib
+*_MSFT_EBC_CC_NAME      = iec.exe
+*_MSFT_EBC_SLINK_NAME   = link.exe
+*_MSFT_EBC_PP_NAME      = iec.exe
 
 # GCC definitions
-#*_GCC_*_*_FAMILY = GCC
-#*_GCC_*_CC_NAME = gcc
-#*_GCC_*_SLINK_NAME = ar
-#*_GCC_*_DLINK_NAME = ld
-#*_GCC_*_ASM_NAME = ml.exe
-#*_GCC_*_PP_NAME=gcc
+#*_GCC_*_*_FAMILY       = GCC
+#*_GCC_*_CC_NAME        = gcc
+#*_GCC_*_SLINK_NAME     = ar
+#*_GCC_*_DLINK_NAME     = ld
 
 # GCC, IA32
-#*_GCC_IA32_*_PATH = C:\cygwin\opt\tiano\i386-tiano-pe\i386-tiano-pe\bin
-#*_GCC_IA32_ASM_PATH = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin
-#*_GCC_IA32_ASM_DPATH = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE
+#*_GCC_IA32_*_PATH      = C:\cygwin\opt\tiano\i386-tiano-pe\i386-tiano-pe\bin
+#*_GCC_IA32_ASM_FAMILY  = MSFT
+#*_GCC_IA32_ASM_NAME    = ml.exe
+#*_GCC_IA32_ASM_PATH    = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin
+#*_GCC_IA32_ASM_DPATH   = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE
+#*_GCC_IA32_PP_FAMILY   = MSFT
+#*_GCC_IA32_PP_NAME     = cl.exe
+#*_GCC_IA32_PP_PATH     = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin
+#*_GCC_IA32_PP_DPATH    = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE