Check In Build.exe and tools_def.template

1. Declare entry point, constructor into AutoGen.h
2. Create ModuleNameStrDefs.h to contain uni code string ID.

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

diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index 72dc31b8310ecb6dbd3bf70b4970c9a9f067bbe9..9431b2dc3f8f700d7be301c39c41383387f63590 100755 (executable)
Binary files a/BaseTools/Bin/Win32/build.exe and b/BaseTools/Bin/Win32/build.exe differ

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 999865f4d6e3a7d2470d5d74271b3c7a6b96d6c5..c303a0eae4fcabfd73db8f9b3ea56a17b1f20251 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -153,7 +153,7 @@ DEFINE ASL_BIN = C:\ASL
       *_VS2003_IA32_MAKE_FLAGS           = /nologo\r
       *_VS2003_IA32_APP_FLAGS            = /nologo /E /TC\r
       *_VS2003_IA32_PP_FLAGS             = /nologo /E /TC /FIAutoGen.h\r
-      *_VS2003_IA32_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+      *_VS2003_IA32_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
   DEBUG_VS2003_IA32_CC_FLAGS             = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Zi /Gm\r
 RELEASE_VS2003_IA32_CC_FLAGS             = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX-\r
   DEBUG_VS2003_IA32_PCH_FLAGS            = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
@@ -183,7 +183,7 @@ RELEASE_VS2003_IA32_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_VS2005PRO_*_SLINK_FLAGS                = /NOLOGO /LTCG\r
 *_VS2005PRO_*_APP_FLAGS                  = /nologo /E /TC\r
 *_VS2005PRO_*_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h\r
-*_VS2005PRO_*_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+*_VS2005PRO_*_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
 ##################\r
 # IA32 definitions\r
 ##################\r
@@ -248,7 +248,7 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_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
+*_VS2005TEAMSUITE_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
 ##################\r
 # IA32 definitions\r
 ##################\r
@@ -337,7 +337,7 @@ RELEASE_VS2005TEAMSUITE_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_WINDDK3790x1830_*_PP_FLAGS             = /nologo /E /TC /FIAutoGen.h\r
 *_WINDDK3790x1830_*_APP_FLAGS            = /nologo /E /TC\r
 *_WINDDK3790x1830_*_SLINK_FLAGS          = /nologo /LTCG\r
-*_WINDDK3790x1830_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+*_WINDDK3790x1830_*_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
 \r
 ##################\r
 # ASL definitions\r
@@ -445,7 +445,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_UNIXGCC_*_DLINK_FLAGS                  = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20 -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
 *_UNIXGCC_*_ASM_FLAGS                    = -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h\r
 *_UNIXGCC_*_PP_FLAGS                     = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
-*_UNIXGCC_*_VFRPP_FLAGS                  = -x c -E -P -DVFRCOMPILE --include AutoGen.h\r
+*_UNIXGCC_*_VFRPP_FLAGS                  = -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
 *_UNIXGCC_*_MAKE_PATH                    = make\r
 \r
 ##################\r
@@ -489,7 +489,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_CYGWINGCC_*_ASM_FLAGS                  = -c -x assembler -imacros AutoGen.h\r
 *_CYGWINGCC_*_PP_FLAGS                   = -E -x assembler-with-cpp -include AutoGen.h\r
 *_CYGWINGCC_*_APP_FLAGS                  = -E -x assembler\r
-*_CYGWINGCC_*_VFRPP_FLAGS                = -x c -E -P -DVFRCOMPILE --include AutoGen.h\r
+*_CYGWINGCC_*_VFRPP_FLAGS                = -x c -E -P -DVFRCOMPILE --include $(MODULE_NAME)StrDefs.h\r
 \r
 ##################\r
 # IA32 definitions\r
@@ -540,7 +540,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 #*_ELFGCC_*_DLINK_FLAGS                   = -melf_i386 -nostdlib -n -q -Ttext 0x220 --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT)\r
 *_ELFGCC_*_ASM_FLAGS                     = -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h\r
 *_ELFGCC_*_PP_FLAGS                      = -m32 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
-*_ELFGCC_*_VFRPP_FLAGS                   = -x c -E -P -DVFRCOMPILE --include AutoGen.h\r
+*_ELFGCC_*_VFRPP_FLAGS                   = -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
 \r
 \r
 ####################################################################################\r
@@ -594,7 +594,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_ICC_*_MAKE_PATH                   = DEF(VS2005TEAMSUITE_BIN)\nmake.exe\r
 \r
 *_ICC_*_MAKE_FLAGS                       = /nologo\r
-*_ICC_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+*_ICC_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
 *_ICC_*_APP_FLAGS                        = /nologo /E /TC\r
 *_ICC_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h\r
 \r
@@ -708,7 +708,7 @@ RELEASE_ICC_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_MYTOOLS_*_ASL_PATH                = DEF(ASL_BIN)\iasl.exe\r
 \r
 *_MYTOOLS_*_MAKE_FLAGS                   = /nologo\r
-*_MYTOOLS_*_VFRPP_FLAGS                  = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+*_MYTOOLS_*_VFRPP_FLAGS                  = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
 *_MYTOOLS_*_APP_FLAGS                    = /nologo /E /TC\r
 *_MYTOOLS_*_PP_FLAGS                     = /nologo /E /TC /FIAutoGen.h\r
 *_MYTOOLS_*_SLINK_FLAGS                  = /nologo /LTCG\r
@@ -806,7 +806,7 @@ RELEASE_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_MYTOOLS_EBC_MAKE_FLAGS                 = /nologo\r
 *_MYTOOLS_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h\r
 *_MYTOOLS_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h\r
-*_MYTOOLS_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
+*_MYTOOLS_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
 *_MYTOOLS_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC\r
 *_MYTOOLS_EBC_DLINK_FLAGS                = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP\r
 \r
@@ -823,3 +823,4 @@ RELEASE_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_*_*_ASLDLINK_FLAGS               = /NODEFAULTLIB /ENTRY:main\r
 *_*_*_ASLPP_FLAGS                  = /nologo /EP /C\r
 *_*_*_ASL_FLAGS                    =\r
+\r