more fixes for VS2017 compilation

6 files changed, 61 insertions, 17 deletions

diff --git a/bin15/mir_full.sln b/bin15/mir_full.sln
index ce5e8fb305..dee899d3e6 100644
--- a/bin15/mir_full.sln
+++ b/bin15/mir_full.sln
@@ -1329,7 +1329,9 @@ Global
 		{0FF6989B-880A-4C3F-B69D-AFF93296044D}.Debug|x64.ActiveCfg = Debug|x64
 		{0FF6989B-880A-4C3F-B69D-AFF93296044D}.Debug|x64.Build.0 = Debug|x64
 		{0FF6989B-880A-4C3F-B69D-AFF93296044D}.Release|Win32.ActiveCfg = Release|Win32
+		{0FF6989B-880A-4C3F-B69D-AFF93296044D}.Release|Win32.Build.0 = Release|Win32
 		{0FF6989B-880A-4C3F-B69D-AFF93296044D}.Release|x64.ActiveCfg = Release|x64
+		{0FF6989B-880A-4C3F-B69D-AFF93296044D}.Release|x64.Build.0 = Release|x64
 		{A7D9DFA5-C34F-4B98-BEE8-5140EFCD2E8C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A7D9DFA5-C34F-4B98-BEE8-5140EFCD2E8C}.Debug|Win32.Build.0 = Debug|Win32
 		{A7D9DFA5-C34F-4B98-BEE8-5140EFCD2E8C}.Debug|x64.ActiveCfg = Debug|x64
@@ -1447,7 +1449,9 @@ Global
 		{C619A811-8023-4441-B3D7-785388A09DF0}.Debug|x64.ActiveCfg = Debug|x64
 		{C619A811-8023-4441-B3D7-785388A09DF0}.Debug|x64.Build.0 = Debug|x64
 		{C619A811-8023-4441-B3D7-785388A09DF0}.Release|Win32.ActiveCfg = Release|Win32
+		{C619A811-8023-4441-B3D7-785388A09DF0}.Release|Win32.Build.0 = Release|Win32
 		{C619A811-8023-4441-B3D7-785388A09DF0}.Release|x64.ActiveCfg = Release|x64
+		{C619A811-8023-4441-B3D7-785388A09DF0}.Release|x64.Build.0 = Release|x64
 		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug|Win32.Build.0 = Debug|Win32
 		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug|x64.ActiveCfg = Debug|x64
@@ -1645,7 +1649,9 @@ Global
 		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug|x64.ActiveCfg = Debug|X64
 		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug|x64.Build.0 = Debug|X64
 		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release|Win32.ActiveCfg = Release|Win32
+		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release|Win32.Build.0 = Release|Win32
 		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release|x64.ActiveCfg = Release|x64
+		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release|x64.Build.0 = Release|x64
 		{DBB261B4-E433-4DFF-8A5D-6C3B5B5F4FF4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{DBB261B4-E433-4DFF-8A5D-6C3B5B5F4FF4}.Debug|Win32.Build.0 = Debug|Win32
 		{DBB261B4-E433-4DFF-8A5D-6C3B5B5F4FF4}.Debug|x64.ActiveCfg = Debug|x64
@@ -1665,7 +1671,9 @@ Global
 		{3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Debug|x64.ActiveCfg = Debug|x64
 		{3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Debug|x64.Build.0 = Debug|x64
 		{3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Release|Win32.ActiveCfg = Release|Win32
+		{3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Release|Win32.Build.0 = Release|Win32
 		{3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Release|x64.ActiveCfg = Release|x64
+		{3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Release|x64.Build.0 = Release|x64
 		{3C83B0AB-9739-41C1-A127-ED7DB9551F76}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3C83B0AB-9739-41C1-A127-ED7DB9551F76}.Debug|Win32.Build.0 = Debug|Win32
 		{3C83B0AB-9739-41C1-A127-ED7DB9551F76}.Debug|x64.ActiveCfg = Debug|x64
@@ -1759,7 +1767,9 @@ Global
 		{CBA58126-3E02-4159-9BD3-059AF9DBC84E}.Debug|x64.ActiveCfg = Debug|x64
 		{CBA58126-3E02-4159-9BD3-059AF9DBC84E}.Debug|x64.Build.0 = Debug|x64
 		{CBA58126-3E02-4159-9BD3-059AF9DBC84E}.Release|Win32.ActiveCfg = Release|Win32
+		{CBA58126-3E02-4159-9BD3-059AF9DBC84E}.Release|Win32.Build.0 = Release|Win32
 		{CBA58126-3E02-4159-9BD3-059AF9DBC84E}.Release|x64.ActiveCfg = Release|x64
+		{CBA58126-3E02-4159-9BD3-059AF9DBC84E}.Release|x64.Build.0 = Release|x64
 		{BE22A21F-73B7-453F-86A0-B867F0056490}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BE22A21F-73B7-453F-86A0-B867F0056490}.Debug|Win32.Build.0 = Debug|Win32
 		{BE22A21F-73B7-453F-86A0-B867F0056490}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/plugins/Boltun/src/Engine/MyCodeCvt.cpp b/plugins/Boltun/src/Engine/MyCodeCvt.cpp
index e6a491947a..92e5046831 100644
--- a/plugins/Boltun/src/Engine/MyCodeCvt.cpp
+++ b/plugins/Boltun/src/Engine/MyCodeCvt.cpp
@@ -55,27 +55,27 @@ MyCodeCvt::result MyCodeCvt::do_unshift(_St&,
 

 #ifdef MSVC

 int MyCodeCvt::do_length(_St& _State, const _To* _F1,

-	const _To* _L1, size_t _N2) const _THROW0()

+	const _To* _L1, size_t _N2) const throw()

 #else

 int MyCodeCvt::do_length(const _St&, const _To* _F1,

-	const _To* _L1, size_t _N2) const _THROW0()

+	const _To* _L1, size_t _N2) const throw()

 #endif

 

 {

 	return (_N2 < (size_t)(_L1 - _F1)) ? (int)_N2 : (int)(_L1 - _F1);

 }

 

-bool MyCodeCvt::do_always_noconv() const _THROW0()

+bool MyCodeCvt::do_always_noconv() const throw()

 {

 	return true;

 }

 

-int MyCodeCvt::do_max_length() const _THROW0()

+int MyCodeCvt::do_max_length() const throw()

 {

 	return 2;

 }

 

-int MyCodeCvt::do_encoding() const _THROW0()

+int MyCodeCvt::do_encoding() const throw()

 {

 	return 2;

 }

diff --git a/plugins/Boltun/src/Engine/MyCodeCvt.h b/plugins/Boltun/src/Engine/MyCodeCvt.h
index df78cbad1b..e397a6a304 100644
--- a/plugins/Boltun/src/Engine/MyCodeCvt.h
+++ b/plugins/Boltun/src/Engine/MyCodeCvt.h
@@ -43,13 +43,13 @@ protected:
 #endif

 	virtual result do_unshift(_St& _State, _To* _F2, _To* _L2, _To*& _Mid2) const;

 #ifdef MSVC

-	virtual int do_length(_St& _State, const _To* _F1, const _To* _L1, size_t _N2) const _THROW0();

+	virtual int do_length(_St& _State, const _To* _F1, const _To* _L1, size_t _N2) const noexcept;

 #else

-	virtual int do_length(const _St& _State, const _To* _F1, const _To* _L1, size_t _N2) const _THROW0();

+	virtual int do_length(const _St& _State, const _To* _F1, const _To* _L1, size_t _N2) const throw();

 #endif

-	virtual bool do_always_noconv() const _THROW0();

-	virtual int do_max_length() const _THROW0();

-	virtual int do_encoding() const _THROW0();

+	virtual bool do_always_noconv() const throw();

+	virtual int do_max_length() const throw();

+	virtual int do_encoding() const throw();

 };

 

 #endif /* MYCODECVT_H */
\ No newline at end of file
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%)