bin10 removed from batch files

12 files changed, 20 insertions, 28 deletions

diff --git a/copylib.cmd b/copylib.cmd
index 7a4135ebc6..98c6d564b4 100644
--- a/copylib.cmd
+++ b/copylib.cmd
@@ -1,3 +1,3 @@
 @echo off

-copy /Y .\Bin10\Debug\Obj\mir_core\mir_core.lib .\libs\win32

-copy /Y .\Bin10\Debug64\Obj\mir_core\mir_core.lib .\libs\win64

+copy /Y .\Bin15\Debug\Obj\mir_core\mir_core.lib .\libs\win32

+copy /Y .\Bin15\Debug64\Obj\mir_core\mir_core.lib .\libs\win64

diff --git a/copylibapp.cmd b/copylibapp.cmd
index abbccf6639..ad89dd4b43 100644
--- a/copylibapp.cmd
+++ b/copylibapp.cmd
@@ -1,3 +1,3 @@
 @echo off

-copy /Y .\Bin10\Debug\Obj\mir_app\mir_app.lib .\libs\win32

-copy /Y .\Bin10\Debug64\Obj\mir_app\mir_app.lib .\libs\win64

+copy /Y .\Bin15\Debug\Obj\mir_app\mir_app.lib .\libs\win32

+copy /Y .\Bin15\Debug64\Obj\mir_app\mir_app.lib .\libs\win64

diff --git a/copylibjson.cmd b/copylibjson.cmd
index 5d0916b129..da310afaf4 100644
--- a/copylibjson.cmd
+++ b/copylibjson.cmd
@@ -1,3 +1,3 @@
 @echo off

-copy /Y .\Bin10\Debug\Obj\libjson\libjson.lib .\libs\win32

-copy /Y .\Bin10\Debug64\Obj\libjson\libjson.lib .\libs\win64

+copy /Y .\Bin15\Debug\Obj\libjson\libjson.lib .\libs\win32

+copy /Y .\Bin15\Debug64\Obj\libjson\libjson.lib .\libs\win64

diff --git a/make_core_def.cmd b/make_core_def.cmd
index d562eabb98..deace1cedd 100644
--- a/make_core_def.cmd
+++ b/make_core_def.cmd
@@ -1,13 +1,13 @@
 @echo off

 echo.

-.\tools\makedef\makedef.exe /IMAGE:bin10\debug\libs\mir_core.mir /DEF:src\mir_core\src\mir_core.def

+.\tools\makedef\makedef.exe /IMAGE:bin15\debug\libs\mir_core.mir /DEF:src\mir_core\src\mir_core.def

 echo.

-.\tools\makedef\makedef.exe /IMAGE:bin10\debug64\libs\mir_core.mir /DEF:src\mir_core\src\mir_core64.def

+.\tools\makedef\makedef.exe /IMAGE:bin15\debug64\libs\mir_core.mir /DEF:src\mir_core\src\mir_core64.def

 echo.

-.\tools\makedef\makedef.exe /IMAGE:bin10\debug\libs\mir_app.mir /DEF:src\mir_app\src\mir_app.def

+.\tools\makedef\makedef.exe /IMAGE:bin15\debug\libs\mir_app.mir /DEF:src\mir_app\src\mir_app.def

 echo.

-.\tools\makedef\makedef.exe /IMAGE:bin10\debug64\libs\mir_app.mir /DEF:src\mir_app\src\mir_app64.def

+.\tools\makedef\makedef.exe /IMAGE:bin15\debug64\libs\mir_app.mir /DEF:src\mir_app\src\mir_app64.def

 echo.

-.\tools\makedef\makedef.exe /IMAGE:bin10\debug\libs\libjson.mir /DEF:libs\libjson\src\libjson.def

+.\tools\makedef\makedef.exe /IMAGE:bin15\debug\libs\libjson.mir /DEF:libs\libjson\src\libjson.def

 echo.

-.\tools\makedef\makedef.exe /IMAGE:bin10\debug64\libs\libjson.mir /DEF:libs\libjson\src\libjson64.def

+.\tools\makedef\makedef.exe /IMAGE:bin15\debug64\libs\libjson.mir /DEF:libs\libjson\src\libjson64.def

diff --git a/plugins/Actman/make.bat b/plugins/Actman/make.bat
index 7f324c52a0..3f06ece2b5 100644
--- a/plugins/Actman/make.bat
+++ b/plugins/Actman/make.bat
@@ -2,7 +2,7 @@
 set p1=%1

 set p2=%2

 if  "%p1%" == "" (echo "please specify target platform by adding 'fpc' or 'fpc64 parameter to command line!'"&&pause&&goto :EOF)

-if  "%p2%" == "" (echo "please specify target output directory by adding 10 for bin10 or 12 for bin12 to command line!'"&&pause&&goto :EOF)

+if  "%p2%" == "" (echo "please specify target output directory by adding 15 for bin15 to command line!'"&&pause&&goto :EOF)

 if /i '%1' == 'fpc' (

   set OUTDIR="..\..\bin%2\Release\Plugins"

   set FPCBIN=fpc.exe

diff --git a/plugins/ImportTXT/make.bat b/plugins/ImportTXT/make.bat
index f193aa20a5..d513c4e506 100644
--- a/plugins/ImportTXT/make.bat
+++ b/plugins/ImportTXT/make.bat
@@ -2,7 +2,7 @@
 set p1=%1

 set p2=%2

 if  "%p1%" == "" (echo "please specify target platform by adding 'fpc' or 'fpc64 parameter to command line!'"&&pause&&goto :EOF)

-if  "%p2%" == "" (echo "please specify target output directory by adding 10 for bin10 or 12 for bin12 to command line!'"&&pause&&goto :EOF)

+if  "%p2%" == "" (echo "please specify target output directory by adding 15 for bin15 to command line!'"&&pause&&goto :EOF)

 if /i '%1' == 'fpc' (

   set OUTDIR="..\..\bin%2\Release\Plugins"

   set FPCBIN=fpc.exe

diff --git a/plugins/QuickSearch/make.bat b/plugins/QuickSearch/make.bat
index c9beaad65a..e81991df45 100644
--- a/plugins/QuickSearch/make.bat
+++ b/plugins/QuickSearch/make.bat
@@ -2,7 +2,7 @@
 set p1=%1

 set p2=%2

 if  "%p1%" == "" (echo "please specify target platform by adding 'fpc' or 'fpc64 parameter to command line!'"&&pause&&goto :EOF)

-if  "%p2%" == "" (echo "please specify target output directory by adding 10 for bin10 or 12 for bin12 to command line!'"&&pause&&goto :EOF)

+if  "%p2%" == "" (echo "please specify target output directory by adding 15 for bin15 to command line!'"&&pause&&goto :EOF)

 if /i '%1' == 'fpc' (

   set OUTDIR="..\..\bin%2\Release\Plugins"

   set FPCBIN=fpc.exe

diff --git a/plugins/Watrack/icons/makeicons.bat b/plugins/Watrack/icons/makeicons.bat
index 0fb9712985..a8ea65a2ab 100644
--- a/plugins/Watrack/icons/makeicons.bat
+++ b/plugins/Watrack/icons/makeicons.bat
@@ -2,7 +2,7 @@ rem @echo off
 set p1=%1

 set p2=%2

 if  "%p1%" == "" (echo "please specify target platform by adding 'fpc' or 'fpc64 parameter to command line!'"&&pause&&goto :EOF)

-if  "%p2%" == "" (echo "please specify target output directory by adding 10 for bin10 or 12 for bin12 to command line!'"&&pause&&goto :EOF)

+if  "%p2%" == "" (echo "please specify target output directory by adding 15 for bin15 to command line!'"&&pause&&goto :EOF)

 if /i '%1' == 'fpc' (

   set OUTDIR="..\..\..\bin%2\Release\Icons"

   set FPCBIN=fpc.exe

diff --git a/plugins/Watrack/make.bat b/plugins/Watrack/make.bat
index 504991c712..95170bd99b 100644
--- a/plugins/Watrack/make.bat
+++ b/plugins/Watrack/make.bat
@@ -2,7 +2,7 @@
 set p1=%1

 set p2=%2

 if  "%p1%" == "" (echo "please specify target platform by adding 'fpc' or 'fpc64 parameter to command line!'"&&pause&&goto :EOF)

-if  "%p2%" == "" (echo "please specify target output directory by adding 10 for bin10 or 12 for bin12 to command line!'"&&pause&&goto :EOF)

+if  "%p2%" == "" (echo "please specify target output directory by adding 15 for bin15 to command line!'"&&pause&&goto :EOF)

 if /i '%1' == 'fpc' (

   set OUTDIR="..\..\bin%2\Release\Plugins"

   set FPCBIN=fpc.exe

diff --git a/plugins/mRadio/make.bat b/plugins/mRadio/make.bat
index b55a8c1941..e9a15fee74 100644
--- a/plugins/mRadio/make.bat
+++ b/plugins/mRadio/make.bat
@@ -2,7 +2,7 @@
 set p1=%1

 set p2=%2

 if  "%p1%" == "" (echo "please specify target platform by adding 'fpc' or 'fpc64 parameter to command line!'"&&pause&&goto :EOF)

-if  "%p2%" == "" (echo "please specify target output directory by adding 10 for bin10 or 12 for bin12 to command line!'"&&pause&&goto :EOF)

+if  "%p2%" == "" (echo "please specify target output directory by adding 15 for bin15 to command line!'"&&pause&&goto :EOF)

 if /i '%1' == 'fpc' (

   set OUTDIR="..\..\bin%2\Release\Plugins"

   set FPCBIN=fpc.exe

diff --git a/tools/build_scripts/z1_ReBuild_Full.bat b/tools/build_scripts/z1_ReBuild_Full.bat
index 5e9a7b1038..ce533ef07b 100644
--- a/tools/build_scripts/z1_ReBuild_Full.bat
+++ b/tools/build_scripts/z1_ReBuild_Full.bat
@@ -28,15 +28,7 @@ pushd ..\build
 call make_ver.bat
 popd
 
-if "%comp%" == "bin10" (
-   start /min /wait z1_ReBuild_w810.bat %tp%
-)
-
-if "%comp%"=="bin10" (
-   call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat"
-) else if "%comp%"=="bin12" (
-   call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat"
-) else if "%comp%"=="bin15" (
+if "%comp%"=="bin15" (
    call "%VS141COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvars%tp%.bat"
 )
 
diff --git a/tools/build_scripts/zz_zRebuildUploadStable.bat b/tools/build_scripts/zz_zRebuildUploadStable.bat
index 63612630d5..3ec480bff8 100644
--- a/tools/build_scripts/zz_zRebuildUploadStable.bat
+++ b/tools/build_scripts/zz_zRebuildUploadStable.bat
@@ -2,7 +2,7 @@
 echo WARNING!!! You are about to compile and upload STABLE versions of Miranda NG! Are you absolutely sure?!
 pause
 
-set comp=bin10
+set comp=bin15
 
 for /F "tokens=1,2,3 delims= " %%i in (build/build.no.stable) do set Branch=%%i_%%j_%%k