diff options
Diffstat (limited to 'tools/build_scripts/z1_ReBuild_Full.bat')
| -rw-r--r-- | tools/build_scripts/z1_ReBuild_Full.bat | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/tools/build_scripts/z1_ReBuild_Full.bat b/tools/build_scripts/z1_ReBuild_Full.bat index 29c33fd180..7c5911b63b 100644 --- a/tools/build_scripts/z1_ReBuild_Full.bat +++ b/tools/build_scripts/z1_ReBuild_Full.bat @@ -11,7 +11,19 @@ set comp=%2 if "%comp%"=="" (echo "please specify target compiler folder!" && pause && goto :EOF) call a_SetVar%tp%.bat -call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" + +if "%comp%"=="bin10" ( + call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" +) else if "%comp%"=="bin12" ( + call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" +) else if "%comp%"=="bin15" ( + if /i '%tp%' == '32' ( + call "%VS141COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvars32.bat" + ) else if /i '%tp%' == '64' ( + call "%VS141COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvars64.bat" + ) +) + if exist git_error.txt del /f /q git_error.txt pushd %comp% @@ -30,7 +42,11 @@ popd MsBuild.exe "mir_full.sln" /m /t:Rebuild /p:Configuration=Release;Platform="%ptr%" /fileLogger /fileLoggerParameters:LogFile=Logs\full%tp%.log;errorsonly;warningsonly;summary MsBuild.exe "mir_icons.sln" /m /t:Rebuild /p:Configuration=Release;Platform="%ptr%" /fileLogger /fileLoggerParameters:LogFile=Logs\icons%tp%.log;errorsonly;warningsonly;summary -start /wait z1_ReBuild_w810.bat %tp% + +if "%comp%" == "bin10" ( + start /wait z1_ReBuild_w810.bat %tp% +) + call pascal%tp%.bat pushd ..\plugins\NotifyAnything\SendLog call compile%tp%.bat |