summaryrefslogtreecommitdiff
path: root/BaseTools
diff options
context:
space:
mode:
Diffstat (limited to 'BaseTools')
-rwxr-xr-xBaseTools/Bin/Win32/GenFds.exebin1287222 -> 1298785 bytes
-rwxr-xr-xBaseTools/Bin/Win32/build.exebin1499833 -> 1522006 bytes
-rw-r--r--BaseTools/Conf/target.template4
-rw-r--r--BaseTools/Conf/tools_def.template87
4 files changed, 38 insertions, 53 deletions
diff --git a/BaseTools/Bin/Win32/GenFds.exe b/BaseTools/Bin/Win32/GenFds.exe
index eac822b..a804fb3 100755
--- a/BaseTools/Bin/Win32/GenFds.exe
+++ b/BaseTools/Bin/Win32/GenFds.exe
Binary files differ
diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index 1886886..7eb3be4 100755
--- a/BaseTools/Bin/Win32/build.exe
+++ b/BaseTools/Bin/Win32/build.exe
Binary files differ
diff --git a/BaseTools/Conf/target.template b/BaseTools/Conf/target.template
index e8e3243..4f04e93 100644
--- a/BaseTools/Conf/target.template
+++ b/BaseTools/Conf/target.template
@@ -63,9 +63,9 @@ TOOL_CHAIN_TAG = MYTOOLS
# This feature is only available for "spawn" build mode, and
# only for PLATFORM build. The clean, cleanall or
# stand-alone module build is still using the normal way.
-MULTIPLE_THREAD = Disable
+MULTIPLE_THREAD = Enable
# MAX_CONCURRENT_THREAD_NUMBER NUMBER Optional The number of concurrent threads. Default is 2. Recommend to
# set this value to one more than the number of your compurter
# cores or CPUs.
-MAX_CONCURRENT_THREAD_NUMBER = 2
+MAX_CONCURRENT_THREAD_NUMBER = 1
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 541d60d..8097fc2 100644
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -654,60 +654,51 @@ RELEASE_ICC_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
*_MYTOOLS_*_ASL_PATH = DEF(ASL_BIN)\iasl.exe
+*_MYTOOLS_*_MAKE_FLAGS = /nologo
*_MYTOOLS_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h
+*_MYTOOLS_*_APP_FLAGS = /nologo /E /TC
+*_MYTOOLS_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
+*_MYTOOLS_*_SLINK_FLAGS = /nologo /LTCG
##################
# IA32 definitions
##################
-*_MYTOOLS_IA32_*_DLL = DEF(VSNET2003_DLL)
+*_MYTOOLS_IA32_*_DLL = DEF(VS2005TEAMSUITE_DLL)
-*_MYTOOLS_IA32_MAKE_PATH = DEF(VSNET2003_BIN)\nmake.exe
-*_MYTOOLS_IA32_CC_PATH = DEF(VSNET2003_BIN)\cl.exe
-*_MYTOOLS_IA32_SLINK_PATH = DEF(VSNET2003_BIN)\lib.exe
-*_MYTOOLS_IA32_DLINK_PATH = DEF(VSNET2003_BIN)\link.exe
+*_MYTOOLS_IA32_MAKE_PATH = DEF(VS2005TEAMSUITE_BIN)\nmake.exe
+*_MYTOOLS_IA32_CC_PATH = DEF(VS2005TEAMSUITE_BIN)\cl.exe
+*_MYTOOLS_IA32_SLINK_PATH = DEF(VS2005TEAMSUITE_BIN)\lib.exe
+*_MYTOOLS_IA32_DLINK_PATH = DEF(VS2005TEAMSUITE_BIN)\link.exe
*_MYTOOLS_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe
-*_MYTOOLS_IA32_PP_PATH = DEF(VSNET2003_BIN)\cl.exe
-*_MYTOOLS_IA32_VFRPP_PATH = DEF(VSNET2003_BIN)\cl.exe
-*_MYTOOLS_IA32_APP_PATH = DEF(VSNET2003_BIN)\cl.exe
-*_MYTOOLS_IA32_ASM_PATH = DEF(VSNET2003_BIN)\ml.exe
-*_MYTOOLS_IA32_PCH_PATH = DEF(VSNET2003_BIN)\cl.exe
-
- *_MYTOOLS_IA32_MAKE_FLAGS = /nologo
- *_MYTOOLS_IA32_APP_FLAGS = /nologo /E /TC
- *_MYTOOLS_IA32_PP_FLAGS = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h
- DEBUG_MYTOOLS_IA32_CC_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm
-RELEASE_MYTOOLS_IA32_CC_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192
- DEBUG_MYTOOLS_IA32_PCH_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm
-RELEASE_MYTOOLS_IA32_PCH_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC
+*_MYTOOLS_IA32_PP_PATH = DEF(VS2005TEAMSUITE_BIN)\cl.exe
+*_MYTOOLS_IA32_VFRPP_PATH = DEF(VS2005TEAMSUITE_BIN)\cl.exe
+*_MYTOOLS_IA32_APP_PATH = DEF(VS2005TEAMSUITE_BIN)\cl.exe
+*_MYTOOLS_IA32_ASM_PATH = DEF(VS2005TEAMSUITE_BIN)\ml.exe
+
+ DEBUG_MYTOOLS_IA32_CC_FLAGS = /nologo /GS- /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm
+RELEASE_MYTOOLS_IA32_CC_FLAGS = /nologo /GS- /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192
DEBUG_MYTOOLS_IA32_ASM_FLAGS = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi
RELEASE_MYTOOLS_IA32_ASM_FLAGS = /nologo /W3 /WX /c /coff /Cx /Zd /W0
*_MYTOOLS_IA32_ASMLINK_FLAGS = /nologo /tiny
- *_MYTOOLS_IA32_SLINK_FLAGS = /nologo /LTCG
- DEBUG_MYTOOLS_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 /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb
-RELEASE_MYTOOLS_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 /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb
+ DEBUG_MYTOOLS_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 /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb
+RELEASE_MYTOOLS_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 /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb
##################
# x64 definitions
##################
-*_MYTOOLS_X64_MAKE_PATH = DEF(WINDDK_BIN32)\nmake.exe
-*_MYTOOLS_X64_CC_PATH = DEF(WINDDK_BINX64)\cl.exe
-*_MYTOOLS_X64_SLINK_PATH = DEF(WINDDK_BINX64)\lib.exe
-*_MYTOOLS_X64_DLINK_PATH = DEF(WINDDK_BINX64)\link.exe
-*_MYTOOLS_X64_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe
-*_MYTOOLS_X64_PP_PATH = DEF(WINDDK_BINX64)\cl.exe
-*_MYTOOLS_X64_VFRPP_PATH = DEF(WINDDK_BINX64)\cl.exe
-*_MYTOOLS_X64_APP_PATH = DEF(WINDDK_BINX64)\cl.exe
-*_MYTOOLS_X64_ASM_PATH = DEF(WINDDK_BINX64)\ml64.exe
-*_MYTOOLS_X64_PCH_PATH = DEF(WINDDK_BINX64)\cl.exe
-
- *_MYTOOLS_X64_SLINK_FLAGS = /nologo /LTCG
- *_MYTOOLS_X64_APP_FLAGS = /nologo /E /TC
- *_MYTOOLS_X64_PP_FLAGS = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h
- *_MYTOOLS_X64_MAKE_FLAGS = /nologo
- DEBUG_MYTOOLS_X64_CC_FLAGS = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF
-RELEASE_MYTOOLS_X64_CC_FLAGS = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF
- DEBUG_MYTOOLS_X64_PCH_FLAGS = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /Zi /Gm /EHs-c- /GF
-RELEASE_MYTOOLS_X64_PCH_FLAGS = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /EHs-c- /GF
+*_MYTOOLS_X64_*_DLL = DEF(VS2005TEAMSUITE_DLL)
+
+*_MYTOOLS_X64_MAKE_PATH = DEF(VS2005TEAMSUITE_BIN)\nmake.exe
+*_MYTOOLS_X64_CC_PATH = DEF(VS2005TEAMSUITE_BINX64)\cl.exe
+*_MYTOOLS_X64_SLINK_PATH = DEF(VS2005TEAMSUITE_BINX64)\lib.exe
+*_MYTOOLS_X64_DLINK_PATH = DEF(VS2005TEAMSUITE_BINX64)\link.exe
+*_MYTOOLS_X64_PP_PATH = DEF(VS2005TEAMSUITE_BINX64)\cl.exe
+*_MYTOOLS_X64_VFRPP_PATH = DEF(VS2005TEAMSUITE_BINX64)\cl.exe
+*_MYTOOLS_X64_APP_PATH = DEF(VS2005TEAMSUITE_BINX64)\cl.exe
+*_MYTOOLS_X64_ASM_PATH = DEF(VS2005TEAMSUITE_BINX64)\ml64.exe
+
+ DEBUG_MYTOOLS_X64_CC_FLAGS = /nologo /GS- /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm
+RELEASE_MYTOOLS_X64_CC_FLAGS = /nologo /GS- /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192
DEBUG_MYTOOLS_X64_ASM_FLAGS = /nologo /W3 /WX /c /Cx /Zd /Zi
RELEASE_MYTOOLS_X64_ASM_FLAGS = /nologo /W3 /WX /c /Cx /Zd
DEBUG_MYTOOLS_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
@@ -725,21 +716,15 @@ RELEASE_MYTOOLS_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
*_MYTOOLS_IPF_VFRPP_PATH = DEF(WINDDK_BIN64)\cl.exe
*_MYTOOLS_IPF_APP_PATH = DEF(WINDDK_BIN64)\cl.exe
*_MYTOOLS_IPF_ASM_PATH = DEF(WINDDK_BIN64)\ias.exe
-*_MYTOOLS_IPF_PCH_PATH = DEF(WINDDK_BIN64)\cl.exe
*_MYTOOLS_IPF_ASM_OUTPUT = "-o "
- *_MYTOOLS_IPF_MAKE_FLAGS = /nologo
- *_MYTOOLS_IPF_APP_FLAGS = /nologo /E /TC
- *_MYTOOLS_IPF_PP_FLAGS = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h
- DEBUG_MYTOOLS_IPF_CC_FLAGS = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Zx
-RELEASE_MYTOOLS_IPF_CC_FLAGS = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zx
- DEBUG_MYTOOLS_IPF_PCH_FLAGS = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /Zi /Zx
-RELEASE_MYTOOLS_IPF_PCH_FLAGS = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC /Zx
+ DEBUG_MYTOOLS_IPF_CC_FLAGS = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FIAutoGen.h /Zi /Zx
+RELEASE_MYTOOLS_IPF_CC_FLAGS = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FIAutoGen.h /Zx
DEBUG_MYTOOLS_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 -d debug
RELEASE_MYTOOLS_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4
- DEBUG_MYTOOLS_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF /OPT:ICF=10 /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb /DEBUG
-RELEASE_MYTOOLS_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF /OPT:ICF=10 /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb
+ DEBUG_MYTOOLS_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF /OPT:ICF=10 /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG
+RELEASE_MYTOOLS_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF /OPT:ICF=10 /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb
*_MYTOOLS_IPF_SLINK_FLAGS = /nologo /LTCG
##################
@@ -747,7 +732,7 @@ RELEASE_MYTOOLS_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
##################
*_MYTOOLS_EBC_*_FAMILY = INTEL
-*_MYTOOLS_EBC_MAKE_PATH = DEF(VSNET2003_BIN)\nmake.exe
+*_MYTOOLS_EBC_MAKE_PATH = DEF(VS2005TEAMSUITE_BIN)\nmake.exe
*_MYTOOLS_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe
*_MYTOOLS_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe
*_MYTOOLS_EBC_SLINK_PATH = DEF(EBC_BIN)\link.exe
generated by cgit v1.1 at 2024-11-06 17:49:50 +0000