diff --git a/RosBE-Windows/Root/MinGW.cmd b/RosBE-Windows/Root/MinGW.cmd index 62a30ae..90b688e 100644 --- a/RosBE-Windows/Root/MinGW.cmd +++ b/RosBE-Windows/Root/MinGW.cmd @@ -38,6 +38,7 @@ echo. :: for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i +doskey CHDEFGCC = "%_ROSBE_BASEDIR%\chdefgcc.cmd" $* doskey MAKE = "%_ROSBE_MINGWMAKE%" $* doskey MAKEX = "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% $* diff --git a/RosBE-Windows/Root/chdefgcc.cmd b/RosBE-Windows/Root/chdefgcc.cmd index 460ed52..aef38d4 100644 --- a/RosBE-Windows/Root/chdefgcc.cmd +++ b/RosBE-Windows/Root/chdefgcc.cmd @@ -8,7 +8,9 @@ :: @echo off -title Change the current MinGW/GCC directory... +if "%_ROSBE_MODE%" == "RosBE" ( + title Change the current MinGW/GCC directory... +) :: :: Parse the command line arguments. @@ -38,7 +40,9 @@ if "%_1%" == "" ( goto :EOF :EOC -title ReactOS Build Environment %_ROSBE_VERSION% +if defined _ROSBE_VERSION ( + title ReactOS Build Environment %_ROSBE_VERSION% +) :: :: Unload all used Vars. diff --git a/RosBE-Windows/Root/rosbe-gcc-env.cmd b/RosBE-Windows/Root/rosbe-gcc-env.cmd index a85b8d4..b805d0d 100644 --- a/RosBE-Windows/Root/rosbe-gcc-env.cmd +++ b/RosBE-Windows/Root/rosbe-gcc-env.cmd @@ -40,6 +40,12 @@ set LIBRARY_PATH=%_ROSBE_MINGWPATH%\lib;%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROS :: Display the current version of GCC, NASM, ld and make. :: gcc -v 2>&1 | find "gcc version" -nasm -v +if exist "%_ROSBE_MINGWPATH%\bin\nasm.exe" ( + nasm -v +) else ( + if "%_ROSBE_MODE%" == "RosBE" ( + echo ERROR: NASM is required to build ReactOS, none found in the current MinGW/GCC. + ) +) ld -v mingw32-make -v | find "GNU Make"