- completely remove vcomp140.dll

- move all dll into Libs

4 files changed, 46 insertions, 48 deletions

diff --git a/tools/build_scripts/bin15/z3_PackArchives.txt b/tools/build_scripts/bin15/z3_PackArchives.txt
index 746329c3b1..5df18ac9ba 100644
--- a/tools/build_scripts/bin15/z3_PackArchives.txt
+++ b/tools/build_scripts/bin15/z3_PackArchives.txt
@@ -1,48 +1,47 @@
 dbchecker.bat
-api-ms-win-core-console-l1-1-0.dll
-api-ms-win-core-datetime-l1-1-0.dll
-api-ms-win-core-debug-l1-1-0.dll
-api-ms-win-core-errorhandling-l1-1-0.dll
-api-ms-win-core-file-l1-1-0.dll
-api-ms-win-core-file-l1-2-0.dll
-api-ms-win-core-file-l2-1-0.dll
-api-ms-win-core-handle-l1-1-0.dll
-api-ms-win-core-heap-l1-1-0.dll
-api-ms-win-core-interlocked-l1-1-0.dll
-api-ms-win-core-libraryloader-l1-1-0.dll
-api-ms-win-core-localization-l1-2-0.dll
-api-ms-win-core-memory-l1-1-0.dll
-api-ms-win-core-namedpipe-l1-1-0.dll
-api-ms-win-core-processenvironment-l1-1-0.dll
-api-ms-win-core-processthreads-l1-1-0.dll
-api-ms-win-core-processthreads-l1-1-1.dll
-api-ms-win-core-profile-l1-1-0.dll
-api-ms-win-core-rtlsupport-l1-1-0.dll
-api-ms-win-core-string-l1-1-0.dll
-api-ms-win-core-synch-l1-1-0.dll
-api-ms-win-core-synch-l1-2-0.dll
-api-ms-win-core-sysinfo-l1-1-0.dll
-api-ms-win-core-timezone-l1-1-0.dll
-api-ms-win-core-util-l1-1-0.dll
-api-ms-win-crt-conio-l1-1-0.dll
-api-ms-win-crt-convert-l1-1-0.dll
-api-ms-win-crt-environment-l1-1-0.dll
-api-ms-win-crt-filesystem-l1-1-0.dll
-api-ms-win-crt-heap-l1-1-0.dll
-api-ms-win-crt-locale-l1-1-0.dll
-api-ms-win-crt-math-l1-1-0.dll
-api-ms-win-crt-multibyte-l1-1-0.dll
-api-ms-win-crt-private-l1-1-0.dll
-api-ms-win-crt-process-l1-1-0.dll
-api-ms-win-crt-runtime-l1-1-0.dll
-api-ms-win-crt-stdio-l1-1-0.dll
-api-ms-win-crt-string-l1-1-0.dll
-api-ms-win-crt-time-l1-1-0.dll
-api-ms-win-crt-utility-l1-1-0.dll
-msvcp140.dll
-ucrtbase.dll
-vcomp140.dll
-vcruntime140.dll
+Libs\api-ms-win-core-console-l1-1-0.dll
+Libs\api-ms-win-core-datetime-l1-1-0.dll
+Libs\api-ms-win-core-debug-l1-1-0.dll
+Libs\api-ms-win-core-errorhandling-l1-1-0.dll
+Libs\api-ms-win-core-file-l1-1-0.dll
+Libs\api-ms-win-core-file-l1-2-0.dll
+Libs\api-ms-win-core-file-l2-1-0.dll
+Libs\api-ms-win-core-handle-l1-1-0.dll
+Libs\api-ms-win-core-heap-l1-1-0.dll
+Libs\api-ms-win-core-interlocked-l1-1-0.dll
+Libs\api-ms-win-core-libraryloader-l1-1-0.dll
+Libs\api-ms-win-core-localization-l1-2-0.dll
+Libs\api-ms-win-core-memory-l1-1-0.dll
+Libs\api-ms-win-core-namedpipe-l1-1-0.dll
+Libs\api-ms-win-core-processenvironment-l1-1-0.dll
+Libs\api-ms-win-core-processthreads-l1-1-0.dll
+Libs\api-ms-win-core-processthreads-l1-1-1.dll
+Libs\api-ms-win-core-profile-l1-1-0.dll
+Libs\api-ms-win-core-rtlsupport-l1-1-0.dll
+Libs\api-ms-win-core-string-l1-1-0.dll
+Libs\api-ms-win-core-synch-l1-1-0.dll
+Libs\api-ms-win-core-synch-l1-2-0.dll
+Libs\api-ms-win-core-sysinfo-l1-1-0.dll
+Libs\api-ms-win-core-timezone-l1-1-0.dll
+Libs\api-ms-win-core-util-l1-1-0.dll
+Libs\api-ms-win-crt-conio-l1-1-0.dll
+Libs\api-ms-win-crt-convert-l1-1-0.dll
+Libs\api-ms-win-crt-environment-l1-1-0.dll
+Libs\api-ms-win-crt-filesystem-l1-1-0.dll
+Libs\api-ms-win-crt-heap-l1-1-0.dll
+Libs\api-ms-win-crt-locale-l1-1-0.dll
+Libs\api-ms-win-crt-math-l1-1-0.dll
+Libs\api-ms-win-crt-multibyte-l1-1-0.dll
+Libs\api-ms-win-crt-private-l1-1-0.dll
+Libs\api-ms-win-crt-process-l1-1-0.dll
+Libs\api-ms-win-crt-runtime-l1-1-0.dll
+Libs\api-ms-win-crt-stdio-l1-1-0.dll
+Libs\api-ms-win-crt-string-l1-1-0.dll
+Libs\api-ms-win-crt-time-l1-1-0.dll
+Libs\api-ms-win-crt-utility-l1-1-0.dll
+Libs\msvcp140.dll
+Libs\ucrtbase.dll
+Libs\vcruntime140.dll
 mirandaboot.ini
 pu_stub.exe
 Core\StdAuth.dll
diff --git a/tools/build_scripts/z2_PackPluginUpdater.txt b/tools/build_scripts/z2_PackPluginUpdater.txt
index 021aa7010c..ee981880eb 100644
--- a/tools/build_scripts/z2_PackPluginUpdater.txt
+++ b/tools/build_scripts/z2_PackPluginUpdater.txt
@@ -40,7 +40,6 @@ api-ms-win-crt-time-l1-1-0.dll
 api-ms-win-crt-utility-l1-1-0.dll
 msvcp140.dll
 ucrtbase.dll
-vcomp140.dll
 vcruntime140.dll
 Core\StdAuth.dll
 Core\StdAutoAway.dll
diff --git a/tools/installer_ng/MirandaNG.iss b/tools/installer_ng/MirandaNG.iss
index feddadf40a..bb22cc371b 100644
--- a/tools/installer_ng/MirandaNG.iss
+++ b/tools/installer_ng/MirandaNG.iss
@@ -65,8 +65,8 @@ Source: "Files\Icons\Toolbar_icons.dll"; DestDir: "{app}\Icons"; Components: cli
 

 ; Core and core modules

 Source: "Files\{#MirName}"; DestDir: "{app}"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent() 

-Source: "Files\DbChecker.bat"; DestDir: "{app}"; Components: program; Check: IsPortable(); Flags: ignoreversion; AfterInstall: ShowPercent() 

-Source: "Files\*.dll"; DestDir: "{app}"; Components: program; Check: IsPortable(); Flags: ignoreversion; AfterInstall: ShowPercent() 

+Source: "Files\DbChecker.bat"; DestDir: "{app}\Libs"; Components: program; Check: IsPortable(); Flags: ignoreversion; AfterInstall: ShowPercent() 

+Source: "Files\Libs\*.dll"; DestDir: "{app}"; Components: program; Check: IsPortable(); Flags: ignoreversion; AfterInstall: ShowPercent() 

 Source: "Files\Libs\libeay32.mir"; DestDir: "{app}\Libs"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent() 

 Source: "Files\Libs\libjson.mir"; DestDir: "{app}\Libs"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent() 

 Source: "Files\Libs\mir_app.mir"; DestDir: "{app}\Libs"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent() 

diff --git a/tools/installer_ng_stable/MirandaNG.iss b/tools/installer_ng_stable/MirandaNG.iss
index a8dd672db9..795110ac6f 100644
--- a/tools/installer_ng_stable/MirandaNG.iss
+++ b/tools/installer_ng_stable/MirandaNG.iss
@@ -66,7 +66,7 @@ Source: "Files\Icons\Toolbar_icons.dll"; DestDir: "{app}\Icons"; Components: cli
 ; Core and core modules

 Source: "Files\{#MirName}"; DestDir: "{app}"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent() 

 Source: "Files\DbChecker.bat"; DestDir: "{app}"; Components: program; Check: IsPortable(); Flags: ignoreversion; AfterInstall: ShowPercent() 

-Source: "Files\*.dll"; DestDir: "{app}"; Components: program; Check: IsPortable(); Flags: ignoreversion; AfterInstall: ShowPercent() 

+Source: "Files\Libs\*.dll"; DestDir: "{app}\Libs}"; Components: program; Check: IsPortable(); Flags: ignoreversion; AfterInstall: ShowPercent() 

 Source: "Files\Libs\libeay32.mir"; DestDir: "{app}\Libs"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent() 

 Source: "Files\Libs\libjson.mir"; DestDir: "{app}\Libs"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent() 

 Source: "Files\Libs\mir_app.mir"; DestDir: "{app}\Libs"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()