diff --git a/RosBE-Windows/Powershell/Build.ps1 b/RosBE-Windows/Powershell/Build.ps1 index 328fc52..0dcb1ba 100644 --- a/RosBE-Windows/Powershell/Build.ps1 +++ b/RosBE-Windows/Powershell/Build.ps1 @@ -60,9 +60,9 @@ if ($_ROSBE_WRITELOG -eq 1) { New-Item -path "$_ROSBE_LOGDIR" -type directory } $file = "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_TARGET_GCCVERSION-$DATENAME-$TIMENAME.txt" - &{IEX "&'mingw32-make' -j $MAKE_JOBS $($args)"} $($args) 2>&1 | tee-object $file + &{IEX "&'make' -j $MAKE_JOBS $($args)"} $($args) 2>&1 | tee-object $file } else { - &{IEX "&'mingw32-make' -j $MAKE_JOBS $($args)"} $($args) + &{IEX "&'make' -j $MAKE_JOBS $($args)"} $($args) } if ($_ROSBE_SHOWTIME -eq 1) { $sw.Stop() diff --git a/RosBE-Windows/Powershell/version.ps1 b/RosBE-Windows/Powershell/version.ps1 index 1315715..b0904bf 100644 --- a/RosBE-Windows/Powershell/version.ps1 +++ b/RosBE-Windows/Powershell/version.ps1 @@ -30,4 +30,4 @@ if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\nasm.exe") { & bison '--version' | select-string "GNU Bison" $fver = (& flex '--version') -replace ".*version ((\d|\.)+).*",'$1' "flex $fver" -& mingw32-make -v | & find "GNU Make" +& make -v | & find "GNU Make" diff --git a/RosBE-Windows/Root/Build-Shared.cmd b/RosBE-Windows/Root/Build-Shared.cmd index 050c2e6..42bdf3d 100644 --- a/RosBE-Windows/Root/Build-Shared.cmd +++ b/RosBE-Windows/Root/Build-Shared.cmd @@ -55,9 +55,9 @@ if %_ROSBE_WRITELOG% == 1 ( if not exist "%_ROSBE_LOGDIR%\." ( mkdir "%_ROSBE_LOGDIR%" 1> NUL 2> NUL ) - %BUILDTIME_COMMAND% "mingw32-make" -j %MAKE_JOBS% %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt" + %BUILDTIME_COMMAND% "make" -j %MAKE_JOBS% %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt" ) else ( - %BUILDTIME_COMMAND% "mingw32-make" -j %MAKE_JOBS% %* + %BUILDTIME_COMMAND% "make" -j %MAKE_JOBS% %* ) :EOC diff --git a/RosBE-Windows/Root/version.cmd b/RosBE-Windows/Root/version.cmd index 2e274f4..0760830 100644 --- a/RosBE-Windows/Root/version.cmd +++ b/RosBE-Windows/Root/version.cmd @@ -32,4 +32,4 @@ if exist "%_ROSBE_HOST_MINGWPATH%\bin\nasm.exe" ( :: Bison, Flex and Make bison --version | find "GNU Bison" flex --version -mingw32-make -v | find "GNU Make" +make -v | find "GNU Make"