more fixes for VS2017 compilation

3 files changed, 41 insertions, 7 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
diff --git a/tools/build_scripts/z1_ReBuild_Full_Stable.bat b/tools/build_scripts/z1_ReBuild_Full_Stable.bat
index d2b13e61dc..1f236d75e8 100644
--- a/tools/build_scripts/z1_ReBuild_Full_Stable.bat
+++ b/tools/build_scripts/z1_ReBuild_Full_Stable.bat
@@ -11,7 +11,18 @@ 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"
+  )
+)
+
 call svn_stable_ver.bat
 
 pushd %comp%
@@ -33,7 +44,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
diff --git a/tools/build_scripts/z2_PackPluginUpdater.bat b/tools/build_scripts/z2_PackPluginUpdater.bat
index f200e2d07c..cf04dfa1ee 100644
--- a/tools/build_scripts/z2_PackPluginUpdater.bat
+++ b/tools/build_scripts/z2_PackPluginUpdater.bat
@@ -4,7 +4,10 @@ rem use with param 32 or 64
 rem set target platform %tp% from first parameter
 set tp=%1
 set dp=%2
-if  "%tp%"=="" (echo "please specify target platform 32 or 64!"&&pause&&goto :EOF)
+if "%tp%"=="" (echo "please specify target platform 32 or 64!"&&pause&&goto :EOF)
+
+set comp=%3
+if "%comp%"=="" (echo "please specify target compiler folder!" && pause && goto :EOF)
 
 call a_SetVar%tp%.bat
 
@@ -13,10 +16,10 @@ if exist %Arch% rd /Q /S "%Arch%" >nul
 rem making temp dirs
 mkdir %Arch%
 
-if  not exist "bin10\Release%tp%" goto EOF
+if not exist "%comp%\Release%tp%" goto EOF
 
 :FILECHECK
-pushd "bin10\Release%tp%"
+pushd "%comp%\Release%tp%"
 if exist %Errors% del /F /Q %Errors%
 if exist %NoErrors% del /F /Q %NoErrors%
 for /f %%a in (..\..\z2_PackPluginUpdater_x%tp%.txt) do (if not exist %%a echo %%a >> %Errors%)