libmdbx extracted back to the separate module, otherwise dbx_mdbx is marked as new on each rebuild

28 files changed, 98 insertions, 39 deletions

diff --git a/bin15/mir_full.sln b/bin15/mir_full.sln
index fe471eef32..6f7c3f9594 100644
--- a/bin15/mir_full.sln
+++ b/bin15/mir_full.sln
@@ -442,6 +442,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DbChecker", "..\plugins\DbC
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QuickSearch", "..\plugins\QuickSearch\quicksearch.vcxproj", "{3C3EAFC2-01FB-4BA8-8E47-42E0969C0D75}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmdbx", "..\libs\libmdbx\libmdbx.vcxproj", "{6D19209B-ECE7-4B9C-941C-0AA2B484F199}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -2000,6 +2002,14 @@ Global
 		{3C3EAFC2-01FB-4BA8-8E47-42E0969C0D75}.Release|Win32.Build.0 = Release|Win32
 		{3C3EAFC2-01FB-4BA8-8E47-42E0969C0D75}.Release|x64.ActiveCfg = Release|x64
 		{3C3EAFC2-01FB-4BA8-8E47-42E0969C0D75}.Release|x64.Build.0 = Release|x64
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|Win32.Build.0 = Debug|Win32
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|x64.ActiveCfg = Debug|x64
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|x64.Build.0 = Debug|x64
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|Win32.ActiveCfg = Release|Win32
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|Win32.Build.0 = Release|Win32
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|x64.ActiveCfg = Release|x64
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2127,6 +2137,7 @@ Global
 		{86033E58-A1E3-43AD-AE8E-305E15E72A91} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2}
 		{A7FAD273-8C71-4D72-A84F-2D160F2DC589} = {D8EA3AE1-64AA-42ED-9F13-83F6C7B5AA55}
 		{A2E9DA24-95E4-4414-94AF-488A382E276A} = {F13387B0-1C74-48EC-9AEC-65E3B9DE29E4}
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {29A0C2A8-07A4-4A8B-8BED-8F7D024013D6}
diff --git a/bin15/miranda32.sln b/bin15/miranda32.sln
index adce26e02c..8fccafc098 100644
--- a/bin15/miranda32.sln
+++ b/bin15/miranda32.sln
@@ -102,8 +102,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginUpdater", "..\plugins
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MetaContacts", "..\src\icons\proto_metacontacts\Proto_MetaContacts.vcxproj", "{793B6174-89B0-4682-A957-A32BE7F61502}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_mdbx", "..\plugins\Dbx_mdbx\dbx_mdbx.vcxproj", "{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeImage", "..\libs\freeimage\freeimage.vcxproj", "{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{52282CDE-49DF-4662-B582-CCF971A9FEC2}"
@@ -136,6 +134,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Facebook", "..\protoc
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DbChecker", "..\plugins\DbChecker\dbchecker.vcxproj", "{A2E9DA24-95E4-4414-94AF-488A382E276A}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_sqlite", "..\plugins\Dbx_sqlite\dbx_sqlite.vcxproj", "{B3494FED-FB8C-43F4-B341-F26A3460203B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -408,14 +408,6 @@ Global
 		{793B6174-89B0-4682-A957-A32BE7F61502}.Release|Win32.Build.0 = Release|Win32
 		{793B6174-89B0-4682-A957-A32BE7F61502}.Release|x64.ActiveCfg = Release|x64
 		{793B6174-89B0-4682-A957-A32BE7F61502}.Release|x64.Build.0 = Release|x64
-		{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}.Debug|Win32.Build.0 = Debug|Win32
-		{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}.Debug|x64.ActiveCfg = Debug|x64
-		{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}.Debug|x64.Build.0 = Debug|x64
-		{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}.Release|Win32.ActiveCfg = Release|Win32
-		{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}.Release|Win32.Build.0 = Release|Win32
-		{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}.Release|x64.ActiveCfg = Release|x64
-		{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}.Release|x64.Build.0 = Release|x64
 		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Debug|Win32.Build.0 = Debug|Win32
 		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Debug|x64.ActiveCfg = Debug|x64
@@ -496,6 +488,14 @@ Global
 		{A2E9DA24-95E4-4414-94AF-488A382E276A}.Release|Win32.Build.0 = Release|Win32
 		{A2E9DA24-95E4-4414-94AF-488A382E276A}.Release|x64.ActiveCfg = Release|x64
 		{A2E9DA24-95E4-4414-94AF-488A382E276A}.Release|x64.Build.0 = Release|x64
+		{B3494FED-FB8C-43F4-B341-F26A3460203B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B3494FED-FB8C-43F4-B341-F26A3460203B}.Debug|Win32.Build.0 = Debug|Win32
+		{B3494FED-FB8C-43F4-B341-F26A3460203B}.Debug|x64.ActiveCfg = Debug|x64
+		{B3494FED-FB8C-43F4-B341-F26A3460203B}.Debug|x64.Build.0 = Debug|x64
+		{B3494FED-FB8C-43F4-B341-F26A3460203B}.Release|Win32.ActiveCfg = Release|Win32
+		{B3494FED-FB8C-43F4-B341-F26A3460203B}.Release|Win32.Build.0 = Release|Win32
+		{B3494FED-FB8C-43F4-B341-F26A3460203B}.Release|x64.ActiveCfg = Release|x64
+		{B3494FED-FB8C-43F4-B341-F26A3460203B}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -533,7 +533,6 @@ Global
 		{796B43EF-DACE-4145-8571-31886F45A2C0} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
 		{21F6C0E4-DD1A-49E6-82FD-64574BB902BD} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
 		{793B6174-89B0-4682-A957-A32BE7F61502} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
-		{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52}
 		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E} = {52282CDE-49DF-4662-B582-CCF971A9FEC2}
 		{0C02E395-E73F-47E3-8B95-B7924C0C7A6A} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52}
 		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
@@ -544,6 +543,7 @@ Global
 		{86033E58-A1E3-43AD-AE8E-305E15E72A91} = {812EF24D-9B76-4A94-ABE0-6F80C381C203}
 		{44298314-7DD4-4EF7-B576-30E503257223} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
 		{A2E9DA24-95E4-4414-94AF-488A382E276A} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52}
+		{B3494FED-FB8C-43F4-B341-F26A3460203B} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5A4CD630-DD83-4096-AA4D-7A141E43E853}
diff --git a/bin16/mir_full.sln b/bin16/mir_full.sln
index 1392c07ab2..4ffe309d5c 100644
--- a/bin16/mir_full.sln
+++ b/bin16/mir_full.sln
@@ -442,6 +442,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DbChecker", "..\plugins\DbC
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QuickSearch", "..\plugins\QuickSearch\quicksearch.vcxproj", "{3C3EAFC2-01FB-4BA8-8E47-42E0969C0D75}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmdbx", "..\libs\libmdbx\libmdbx.vcxproj", "{6D19209B-ECE7-4B9C-941C-0AA2B484F199}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -2000,6 +2002,14 @@ Global
 		{3C3EAFC2-01FB-4BA8-8E47-42E0969C0D75}.Release|Win32.Build.0 = Release|Win32
 		{3C3EAFC2-01FB-4BA8-8E47-42E0969C0D75}.Release|x64.ActiveCfg = Release|x64
 		{3C3EAFC2-01FB-4BA8-8E47-42E0969C0D75}.Release|x64.Build.0 = Release|x64
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|Win32.Build.0 = Debug|Win32
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|x64.ActiveCfg = Debug|x64
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|x64.Build.0 = Debug|x64
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|Win32.ActiveCfg = Release|Win32
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|Win32.Build.0 = Release|Win32
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|x64.ActiveCfg = Release|x64
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2127,6 +2137,7 @@ Global
 		{86033E58-A1E3-43AD-AE8E-305E15E72A91} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2}
 		{A7FAD273-8C71-4D72-A84F-2D160F2DC589} = {D8EA3AE1-64AA-42ED-9F13-83F6C7B5AA55}
 		{A2E9DA24-95E4-4414-94AF-488A382E276A} = {F13387B0-1C74-48EC-9AEC-65E3B9DE29E4}
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {29A0C2A8-07A4-4A8B-8BED-8F7D024013D6}
diff --git a/bin16/miranda32.sln b/bin16/miranda32.sln
index 57196b15ed..1b303db8f9 100644
--- a/bin16/miranda32.sln
+++ b/bin16/miranda32.sln
@@ -102,8 +102,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginUpdater", "..\plugins
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MetaContacts", "..\src\icons\proto_metacontacts\Proto_MetaContacts.vcxproj", "{793B6174-89B0-4682-A957-A32BE7F61502}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_mdbx", "..\plugins\Dbx_mdbx\dbx_mdbx.vcxproj", "{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeImage", "..\libs\freeimage\freeimage.vcxproj", "{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{52282CDE-49DF-4662-B582-CCF971A9FEC2}"
@@ -410,14 +408,6 @@ Global
 		{793B6174-89B0-4682-A957-A32BE7F61502}.Release|Win32.Build.0 = Release|Win32
 		{793B6174-89B0-4682-A957-A32BE7F61502}.Release|x64.ActiveCfg = Release|x64
 		{793B6174-89B0-4682-A957-A32BE7F61502}.Release|x64.Build.0 = Release|x64
-		{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}.Debug|Win32.Build.0 = Debug|Win32
-		{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}.Debug|x64.ActiveCfg = Debug|x64
-		{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}.Debug|x64.Build.0 = Debug|x64
-		{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}.Release|Win32.ActiveCfg = Release|Win32
-		{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}.Release|Win32.Build.0 = Release|Win32
-		{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}.Release|x64.ActiveCfg = Release|x64
-		{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}.Release|x64.Build.0 = Release|x64
 		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Debug|Win32.Build.0 = Debug|Win32
 		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Debug|x64.ActiveCfg = Debug|x64
@@ -543,7 +533,6 @@ Global
 		{796B43EF-DACE-4145-8571-31886F45A2C0} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
 		{21F6C0E4-DD1A-49E6-82FD-64574BB902BD} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
 		{793B6174-89B0-4682-A957-A32BE7F61502} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
-		{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52}
 		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E} = {52282CDE-49DF-4662-B582-CCF971A9FEC2}
 		{0C02E395-E73F-47E3-8B95-B7924C0C7A6A} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52}
 		{B3494FED-FB8C-43F4-B341-F26A3460203B} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52}
diff --git a/libs/libmdbx/libmdbx.vcxproj b/libs/libmdbx/libmdbx.vcxproj
new file mode 100644
index 0000000000..6e2993f936
--- /dev/null
+++ b/libs/libmdbx/libmdbx.vcxproj
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{6D19209B-ECE7-4B9C-941C-0AA2B484F199}</ProjectGuid>
+    <ProjectName>libmdbx</ProjectName>
+  </PropertyGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\build\vc.common\lib.props" />
+  </ImportGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>MDBX_BUILD_SHARED_LIBRARY=1;MDBX_TXN_CHECKOWNER=0;LIBMDBX_EXPORTS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="src\mdbx.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\mdbx.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/libmdbx/libmdbx.vcxproj.filters b/libs/libmdbx/libmdbx.vcxproj.filters
new file mode 100644
index 0000000000..d639ff0633
--- /dev/null
+++ b/libs/libmdbx/libmdbx.vcxproj.filters
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\mdbx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\mdbx.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/plugins/Dbx_mdbx/src/libmdbx/CMakeLists.txt b/libs/libmdbx/src/CMakeLists.txt
index 46afa66fca..46afa66fca 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/CMakeLists.txt
+++ b/libs/libmdbx/src/CMakeLists.txt
diff --git a/plugins/Dbx_mdbx/src/libmdbx/ChangeLog.md b/libs/libmdbx/src/ChangeLog.md
index 50b911f5a7..50b911f5a7 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/ChangeLog.md
+++ b/libs/libmdbx/src/ChangeLog.md
diff --git a/plugins/Dbx_mdbx/src/libmdbx/GNUmakefile b/libs/libmdbx/src/GNUmakefile
index da781606ee..da781606ee 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/GNUmakefile
+++ b/libs/libmdbx/src/GNUmakefile
diff --git a/plugins/Dbx_mdbx/src/libmdbx/LICENSE b/libs/libmdbx/src/LICENSE
index 05ad7571e4..05ad7571e4 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/LICENSE
+++ b/libs/libmdbx/src/LICENSE
diff --git a/plugins/Dbx_mdbx/src/libmdbx/Makefile b/libs/libmdbx/src/Makefile
index bb4aa0531f..bb4aa0531f 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/Makefile
+++ b/libs/libmdbx/src/Makefile
diff --git a/plugins/Dbx_mdbx/src/libmdbx/README.md b/libs/libmdbx/src/README.md
index 66da37c454..66da37c454 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/README.md
+++ b/libs/libmdbx/src/README.md
diff --git a/plugins/Dbx_mdbx/src/libmdbx/VERSION b/libs/libmdbx/src/VERSION
index ad5a80ff3c..ad5a80ff3c 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/VERSION
+++ b/libs/libmdbx/src/VERSION
diff --git a/plugins/Dbx_mdbx/src/libmdbx/config.h.in b/libs/libmdbx/src/config.h.in
index bb3eea07b4..bb3eea07b4 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/config.h.in
+++ b/libs/libmdbx/src/config.h.in
diff --git a/plugins/Dbx_mdbx/src/libmdbx/mdbx.c b/libs/libmdbx/src/mdbx.c
index 6ceafe5097..6ceafe5097 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/mdbx.c
+++ b/libs/libmdbx/src/mdbx.c
diff --git a/plugins/Dbx_mdbx/src/libmdbx/mdbx.c++ b/libs/libmdbx/src/mdbx.c++
index e29b579cef..e29b579cef 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/mdbx.c++
+++ b/libs/libmdbx/src/mdbx.c++
diff --git a/plugins/Dbx_mdbx/src/libmdbx/mdbx.h b/libs/libmdbx/src/mdbx.h
index 9d7dba99e9..9d7dba99e9 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/mdbx.h
+++ b/libs/libmdbx/src/mdbx.h
diff --git a/plugins/Dbx_mdbx/src/libmdbx/mdbx.h++ b/libs/libmdbx/src/mdbx.h++
index 5ae3838aeb..5ae3838aeb 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/mdbx.h++
+++ b/libs/libmdbx/src/mdbx.h++
diff --git a/plugins/Dbx_mdbx/src/libmdbx/mdbx_chk.c b/libs/libmdbx/src/mdbx_chk.c
index a30003be28..a30003be28 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/mdbx_chk.c
+++ b/libs/libmdbx/src/mdbx_chk.c
diff --git a/plugins/Dbx_mdbx/src/libmdbx/mdbx_copy.c b/libs/libmdbx/src/mdbx_copy.c
index faec17ac15..faec17ac15 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/mdbx_copy.c
+++ b/libs/libmdbx/src/mdbx_copy.c
diff --git a/plugins/Dbx_mdbx/src/libmdbx/mdbx_dump.c b/libs/libmdbx/src/mdbx_dump.c
index abf82b0d7c..abf82b0d7c 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/mdbx_dump.c
+++ b/libs/libmdbx/src/mdbx_dump.c
diff --git a/plugins/Dbx_mdbx/src/libmdbx/mdbx_load.c b/libs/libmdbx/src/mdbx_load.c
index fc0021bf1c..fc0021bf1c 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/mdbx_load.c
+++ b/libs/libmdbx/src/mdbx_load.c
diff --git a/plugins/Dbx_mdbx/src/libmdbx/mdbx_stat.c b/libs/libmdbx/src/mdbx_stat.c
index 30e9e5cc29..30e9e5cc29 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/mdbx_stat.c
+++ b/libs/libmdbx/src/mdbx_stat.c
diff --git a/plugins/Dbx_mdbx/src/libmdbx/ntdll.def b/libs/libmdbx/src/ntdll.def
index f974ea6380..f974ea6380 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/ntdll.def
+++ b/libs/libmdbx/src/ntdll.def
diff --git a/plugins/Dbx_mdbx/dbx_mdbx.vcxproj b/plugins/Dbx_mdbx/dbx_mdbx.vcxproj
index affa0b7d8c..63d2e7134e 100644
--- a/plugins/Dbx_mdbx/dbx_mdbx.vcxproj
+++ b/plugins/Dbx_mdbx/dbx_mdbx.vcxproj
@@ -26,9 +26,6 @@
     <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />

   </ImportGroup>

   <ItemGroup>

-    <ClCompile Include="src\libmdbx\mdbx.c">

-      <PrecompiledHeader>NotUsing</PrecompiledHeader>

-    </ClCompile>

     <ClCompile Include="src\dbcheck.cpp" />

     <ClCompile Include="src\dbcontacts.cpp" />

     <ClCompile Include="src\dbcrypt.cpp" />

@@ -42,7 +39,6 @@
       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

     <ClInclude Include="src\dbintf.h" />

-    <ClInclude Include="src\libmdbx\mdbx.h" />

     <ClInclude Include="src\resource.h" />

     <ClInclude Include="src\stdafx.h" />

     <ClInclude Include="src\version.h" />

@@ -51,6 +47,11 @@
     <ResourceCompile Include="res\dbx_mdbx.rc" />

     <ResourceCompile Include="res\version.rc" />

   </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\libs\libmdbx\libmdbx.vcxproj">

+      <Project>{6d19209b-ece7-4b9c-941c-0aa2b484f199}</Project>

+    </ProjectReference>

+  </ItemGroup>

   <ItemDefinitionGroup>

     <ClCompile>

       <PreprocessorDefinitions>MDBX_BUILD_SHARED_LIBRARY=1;MDBX_TXN_CHECKOWNER=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>

diff --git a/plugins/Dbx_mdbx/dbx_mdbx.vcxproj.filters b/plugins/Dbx_mdbx/dbx_mdbx.vcxproj.filters
index daa0b3818e..bf803e0949 100644
--- a/plugins/Dbx_mdbx/dbx_mdbx.vcxproj.filters
+++ b/plugins/Dbx_mdbx/dbx_mdbx.vcxproj.filters
@@ -32,9 +32,6 @@
     <ClCompile Include="src\dbcheck.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\libmdbx\mdbx.c">

-      <Filter>Source Files\libmdbx</Filter>

-    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="src\dbintf.h">

@@ -49,9 +46,6 @@
     <ClInclude Include="src\version.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="src\libmdbx\mdbx.h">

-      <Filter>Source Files\libmdbx</Filter>

-    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\dbx_mdbx.rc">

@@ -61,9 +55,4 @@
       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

-  <ItemGroup>

-    <Filter Include="Source Files\libmdbx">

-      <UniqueIdentifier>{15959756-96ed-4cd0-8392-62451d45921b}</UniqueIdentifier>

-    </Filter>

-  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/Dbx_mdbx/src/stdafx.h b/plugins/Dbx_mdbx/src/stdafx.h
index a3b257bc8e..1ea974f262 100644
--- a/plugins/Dbx_mdbx/src/stdafx.h
+++ b/plugins/Dbx_mdbx/src/stdafx.h
@@ -51,7 +51,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_gui.h>

 #include <m_skin.h>

 

-#include "libmdbx/mdbx.h"

+#include "../../libs/libmdbx/src/mdbx.h"

 

 #ifndef thread_local

 #	define thread_local __declspec(thread)

diff --git a/tools/build_scripts/z2_PackPluginUpdater.bat b/tools/build_scripts/z2_PackPluginUpdater.bat
index 27bbbefabb..5cc139eb7f 100644
--- a/tools/build_scripts/z2_PackPluginUpdater.bat
+++ b/tools/build_scripts/z2_PackPluginUpdater.bat
@@ -46,7 +46,7 @@ for /f %%a in ('dir plugins\*.dll /B /L') do (
 	if /I "%%a"=="Clist_modern.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Plugins\AVS.dll" "Icons\Toolbar_icons.dll")
 	if /I "%%a"=="CmdLine.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "MimCmd.exe")
 	if /I "%%a"=="CurrencyRates.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_CurrencyRates.dll" "Plugins\CurrencyRates\*.xml" "Plugins\CurrencyRates\CurrencyRatesChart.exe")
-	if /I "%%a"=="Dbx_mdbx.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "mdbx_chk.exe" "mdbx_dump.exe" "mdbx_load.exe")
+	if /I "%%a"=="Dbx_mdbx.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "mdbx_chk.exe" "mdbx_dump.exe" "mdbx_load.exe" "Libs\libmdbx.mir")
 	if /I "%%a"=="Discord.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_Discord.dll")
 	if /I "%%a"=="Dummy.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_Dummy.dll")
 	if /I "%%a"=="Facebook.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_Facebook.dll")