b) Cleaned several message strings in code
c) Solved hang issue when the build.exe is broken by Ctrl+C
d) Added more specific information for "-v" option of build.exe
e) Added "-v"/"-d"/"-q" option for GenFds.exe in makefile if build.exe is called with one of them.
f) Removed the calling to vsvars32.bat and added "--nt32" option in edksetup.bat because the nmake.exe's path has been put in tools_def.txt and build.exe will use that information to call nmake.exe
g) Removed the calling to vsvars32.bat in BaseTools/toolsetup.bat
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4091
6f19259b-4bc3-4df7-8a09-
765794883524
##################\r
*_VS2003_IA32_*_DLL = DEF(VSNET2003_DLL)\r
\r
##################\r
*_VS2003_IA32_*_DLL = DEF(VSNET2003_DLL)\r
\r
+*_VS2003_IA32_MAKE_PATH = DEF(VSNET2003_BIN)\nmake.exe\r
*_VS2003_IA32_CC_PATH = DEF(VSNET2003_BIN)\cl.exe\r
*_VS2003_IA32_VFRPP_PATH = DEF(VSNET2003_BIN)\cl.exe\r
*_VS2003_IA32_SLINK_PATH = DEF(VSNET2003_BIN)\lib.exe\r
*_VS2003_IA32_CC_PATH = DEF(VSNET2003_BIN)\cl.exe\r
*_VS2003_IA32_VFRPP_PATH = DEF(VSNET2003_BIN)\cl.exe\r
*_VS2003_IA32_SLINK_PATH = DEF(VSNET2003_BIN)\lib.exe\r
*_VS2003_IA32_ASM_PATH = DEF(VSNET2003_BIN)\ml.exe\r
*_VS2003_IA32_PCH_PATH = DEF(VSNET2003_BIN)\cl.exe\r
\r
*_VS2003_IA32_ASM_PATH = DEF(VSNET2003_BIN)\ml.exe\r
*_VS2003_IA32_PCH_PATH = DEF(VSNET2003_BIN)\cl.exe\r
\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
-DEBUG_VS2003_IA32_CC_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
+ *_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
+ DEBUG_VS2003_IA32_CC_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
RELEASE_VS2003_IA32_CC_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192\r
RELEASE_VS2003_IA32_CC_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192\r
-DEBUG_VS2003_IA32_PCH_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
+ DEBUG_VS2003_IA32_PCH_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
RELEASE_VS2003_IA32_PCH_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
RELEASE_VS2003_IA32_PCH_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
-DEBUG_VS2003_IA32_ASM_FLAGS = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
+ DEBUG_VS2003_IA32_ASM_FLAGS = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
RELEASE_VS2003_IA32_ASM_FLAGS = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
RELEASE_VS2003_IA32_ASM_FLAGS = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
-*_VS2003_IA32_SLINK_FLAGS = /nologo /LTCG\r
-DEBUG_VS2003_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
+ *_VS2003_IA32_SLINK_FLAGS = /nologo /LTCG\r
+ DEBUG_VS2003_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_VS2003_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
\r
####################################################################################\r
RELEASE_VS2003_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
\r
####################################################################################\r
##################\r
*_VS2005PRO_IA32_*_DLL = DEF(VS2005PRO_DLL)\r
\r
##################\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
*_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
*_VS2005PRO_IA32_PP_PATH = DEF(VS2005PRO_BIN)\cl.exe\r
*_VS2005PRO_IA32_ASM_PATH = DEF(VS2005PRO_BIN)\ml.exe\r
\r
*_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
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
*_ICC_IA32_ASM_PATH = DEF(VSNET2003_BIN)\ml.exe\r
*_ICC_IA32_ASM_DLL = DEF(VSNET2003_DLL)\r
\r
*_ICC_IA32_ASM_PATH = DEF(VSNET2003_BIN)\ml.exe\r
*_ICC_IA32_ASM_DLL = DEF(VSNET2003_DLL)\r
\r
-DEBUG_ICC_IA32_CC_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
+ DEBUG_ICC_IA32_CC_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
RELEASE_ICC_IA32_CC_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Gs8192\r
RELEASE_ICC_IA32_CC_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Gs8192\r
-DEBUG_ICC_IA32_PCH_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Yc /TC /Zi /Gm\r
+ DEBUG_ICC_IA32_PCH_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Yc /TC /Zi /Gm\r
RELEASE_ICC_IA32_PCH_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Yc /TC\r
RELEASE_ICC_IA32_PCH_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Yc /TC\r
-DEBUG_ICC_IA32_ASM_FLAGS = /nologo /W3 /WX /c /Zd /W0 /Zi\r
+ DEBUG_ICC_IA32_ASM_FLAGS = /nologo /W3 /WX /c /Zd /W0 /Zi\r
RELEASE_ICC_IA32_ASM_FLAGS = /nologo /W3 /WX /c /Zd /W0\r
RELEASE_ICC_IA32_ASM_FLAGS = /nologo /W3 /WX /c /Zd /W0\r
-*_ICC_IA32_SLINK_FLAGS = /nologo\r
-DEBUG_ICC_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
+ *_ICC_IA32_SLINK_FLAGS = /nologo\r
+ DEBUG_ICC_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_ICC_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
\r
##################\r
RELEASE_ICC_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
\r
##################\r
##################\r
*_MYTOOLS_IA32_*_DLL = DEF(VSNET2003_DLL)\r
\r
##################\r
*_MYTOOLS_IA32_*_DLL = DEF(VSNET2003_DLL)\r
\r
+*_MYTOOLS_IA32_MAKE_PATH = DEF(VSNET2003_BIN)\nmake.exe\r
*_MYTOOLS_IA32_CC_PATH = DEF(VSNET2003_BIN)\cl.exe\r
*_MYTOOLS_IA32_SLINK_PATH = DEF(VSNET2003_BIN)\lib.exe\r
*_MYTOOLS_IA32_DLINK_PATH = DEF(VSNET2003_BIN)\link.exe\r
*_MYTOOLS_IA32_CC_PATH = DEF(VSNET2003_BIN)\cl.exe\r
*_MYTOOLS_IA32_SLINK_PATH = DEF(VSNET2003_BIN)\lib.exe\r
*_MYTOOLS_IA32_DLINK_PATH = DEF(VSNET2003_BIN)\link.exe\r
*_MYTOOLS_IA32_ASM_PATH = DEF(VSNET2003_BIN)\ml.exe\r
*_MYTOOLS_IA32_PCH_PATH = DEF(VSNET2003_BIN)\cl.exe\r
\r
*_MYTOOLS_IA32_ASM_PATH = DEF(VSNET2003_BIN)\ml.exe\r
*_MYTOOLS_IA32_PCH_PATH = DEF(VSNET2003_BIN)\cl.exe\r
\r
+ *_MYTOOLS_IA32_MAKE_FLAGS = /nologo\r
*_MYTOOLS_IA32_APP_FLAGS = /nologo /E /TC\r
*_MYTOOLS_IA32_PP_FLAGS = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
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\r
*_MYTOOLS_IA32_APP_FLAGS = /nologo /E /TC\r
*_MYTOOLS_IA32_PP_FLAGS = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
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\r
##################\r
# x64 definitions\r
##################\r
##################\r
# x64 definitions\r
##################\r
+*_MYTOOLS_X64_MAKE_PATH = DEF(WINDDK_BIN32)\nmake.exe\r
*_MYTOOLS_X64_CC_PATH = DEF(WINDDK_BINX64)\cl.exe\r
*_MYTOOLS_X64_SLINK_PATH = DEF(WINDDK_BINX64)\lib.exe\r
*_MYTOOLS_X64_DLINK_PATH = DEF(WINDDK_BINX64)\link.exe\r
*_MYTOOLS_X64_CC_PATH = DEF(WINDDK_BINX64)\cl.exe\r
*_MYTOOLS_X64_SLINK_PATH = DEF(WINDDK_BINX64)\lib.exe\r
*_MYTOOLS_X64_DLINK_PATH = DEF(WINDDK_BINX64)\link.exe\r
*_MYTOOLS_X64_SLINK_FLAGS = /nologo /LTCG\r
*_MYTOOLS_X64_APP_FLAGS = /nologo /E /TC\r
*_MYTOOLS_X64_PP_FLAGS = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
*_MYTOOLS_X64_SLINK_FLAGS = /nologo /LTCG\r
*_MYTOOLS_X64_APP_FLAGS = /nologo /E /TC\r
*_MYTOOLS_X64_PP_FLAGS = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+ *_MYTOOLS_X64_MAKE_FLAGS = /nologo\r
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\r
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\r
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\r
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\r
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\r
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\r
##################\r
# IPF definitions\r
##################\r
##################\r
# IPF definitions\r
##################\r
+*_MYTOOLS_IPF_MAKE_PATH = DEF(WINDDK_BIN32)\nmake.exe\r
*_MYTOOLS_IPF_CC_PATH = DEF(WINDDK_BIN64)\cl.exe\r
*_MYTOOLS_IPF_SLINK_PATH = DEF(WINDDK_BIN64)\lib.exe\r
*_MYTOOLS_IPF_DLINK_PATH = DEF(WINDDK_BIN64)\link.exe\r
*_MYTOOLS_IPF_CC_PATH = DEF(WINDDK_BIN64)\cl.exe\r
*_MYTOOLS_IPF_SLINK_PATH = DEF(WINDDK_BIN64)\lib.exe\r
*_MYTOOLS_IPF_DLINK_PATH = DEF(WINDDK_BIN64)\link.exe\r
\r
*_MYTOOLS_IPF_ASM_OUTPUT = "-o "\r
\r
\r
*_MYTOOLS_IPF_ASM_OUTPUT = "-o "\r
\r
+ *_MYTOOLS_IPF_MAKE_FLAGS = /nologo\r
*_MYTOOLS_IPF_APP_FLAGS = /nologo /E /TC\r
*_MYTOOLS_IPF_PP_FLAGS = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
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\r
*_MYTOOLS_IPF_APP_FLAGS = /nologo /E /TC\r
*_MYTOOLS_IPF_PP_FLAGS = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
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\r
##################\r
*_MYTOOLS_EBC_*_FAMILY = INTEL\r
\r
##################\r
*_MYTOOLS_EBC_*_FAMILY = INTEL\r
\r
+*_MYTOOLS_EBC_MAKE_PATH = DEF(VSNET2003_BIN)\nmake.exe\r
*_MYTOOLS_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe\r
*_MYTOOLS_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe\r
*_MYTOOLS_EBC_SLINK_PATH = DEF(EBC_BIN)\link.exe\r
*_MYTOOLS_EBC_DLINK_PATH = DEF(EBC_BIN)\link.exe\r
\r
*_MYTOOLS_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe\r
*_MYTOOLS_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe\r
*_MYTOOLS_EBC_SLINK_PATH = DEF(EBC_BIN)\link.exe\r
*_MYTOOLS_EBC_DLINK_PATH = DEF(EBC_BIN)\link.exe\r
\r
+*_MYTOOLS_EBC_MAKE_FLAGS = /nologo\r
*_MYTOOLS_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h\r
*_MYTOOLS_EBC_CC_FLAGS = /nologo /c /W3 /WX /FIAutoGen.h\r
*_MYTOOLS_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC\r
*_MYTOOLS_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h\r
*_MYTOOLS_EBC_CC_FLAGS = /nologo /c /W3 /WX /FIAutoGen.h\r
*_MYTOOLS_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC\r
REM Check the required system environment variables\r
REM\r
\r
REM Check the required system environment variables\r
REM\r
\r
-:check_vc\r
-if defined VCINSTALLDIR goto setup_workspace\r
-if defined VS71COMNTOOLS (\r
- call "%VS71COMNTOOLS%\vsvars32.bat"\r
-) else (\r
- echo.\r
- echo !!!WARNING!!! Cannot find Visual Studio !!!\r
- echo.\r
-)\r
-\r
:setup_workspace\r
REM\r
REM check the EDK_TOOLS_PATH\r
:setup_workspace\r
REM\r
REM check the EDK_TOOLS_PATH\r
@REM\r
@REM Set the WORKSPACE to the current working directory\r
@REM\r
@REM\r
@REM Set the WORKSPACE to the current working directory\r
@REM\r
+@if /I not "%1"=="--nt32" goto check_new_build\r
+shift\r
+goto check_vc\r
+\r
+:check_new_build\r
@if /I "%1"=="NewBuild" goto NewBuild\r
\r
:AntBuild\r
@if /I "%1"=="NewBuild" goto NewBuild\r
\r
:AntBuild\r
:check_vc\r
if defined VCINSTALLDIR goto check_cygwin\r
if defined VS71COMNTOOLS (\r
:check_vc\r
if defined VCINSTALLDIR goto check_cygwin\r
if defined VS71COMNTOOLS (\r
- call "%VS71COMNTOOLS%\vsvars32.bat"\r
+ call "%VS71COMNTOOLS%\vsvars32.bat"\r
) else (\r
echo.\r
echo !!! WARNING !!!! Cannot find Visual Studio !!!\r
echo.\r
)\r
) else (\r
echo.\r
echo !!! WARNING !!!! Cannot find Visual Studio !!!\r
echo.\r
)\r
\r
:check_cygwin\r
if defined CYGWIN_HOME goto check_java\r
\r
:check_cygwin\r
if defined CYGWIN_HOME goto check_java\r