summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libs/libmdbx/libmdbx.vcxproj17
-rw-r--r--libs/libmdbx/libmdbx.vcxproj.filters6
-rw-r--r--libs/libmdbx/mdbx_chk.vcxproj2
-rw-r--r--libs/libmdbx/mdbx_dump.vcxproj2
-rw-r--r--libs/libmdbx/mdbx_load.vcxproj2
-rw-r--r--libs/libmdbx/src/config.h1
-rw-r--r--libs/libmdbx/src/src/miranda.c11
-rw-r--r--plugins/PluginUpdater/src/DlgUpdate.cpp3
-rw-r--r--tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt2
-rw-r--r--tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt1
-rw-r--r--tools/build_scripts/bin15/z3_PackArchives.txt1
-rw-r--r--tools/build_scripts/z2_PackPluginUpdater.txt1
-rw-r--r--tools/installer_ng/MirandaNG.iss1
-rw-r--r--tools/installer_ng_stable/MirandaNG.iss1
14 files changed, 40 insertions, 11 deletions
diff --git a/libs/libmdbx/libmdbx.vcxproj b/libs/libmdbx/libmdbx.vcxproj
index 8990b4cc57..2bc578f5b2 100644
--- a/libs/libmdbx/libmdbx.vcxproj
+++ b/libs/libmdbx/libmdbx.vcxproj
@@ -22,13 +22,21 @@
<ProjectGuid>{6D19209B-ECE7-4B9C-941C-0AA2B484F199}</ProjectGuid>
<ProjectName>libmdbx</ProjectName>
<TargetName>libmdbx</TargetName>
- <ConfigurationType>StaticLibrary</ConfigurationType>
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <OutDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)$(Configuration)64\</OutDir>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ <GenerateManifest>false</GenerateManifest>
+ <EmbedManifest>false</EmbedManifest>
+ </PropertyGroup>
+ <Import Project="$(ProjectDir)..\..\build\vc.common\common.props" />
+ <PropertyGroup>
+ <TargetExt>.mir</TargetExt>
+ <TargetPath>$(OutDir)$(TargetName)$(TargetExt)</TargetPath>
</PropertyGroup>
- <Import Project="$(ProjectDir)..\..\build\vc.common\slib.props" />
<ItemDefinitionGroup>
<ClCompile>
- <PreprocessorDefinitions>MDBX_DEBUG=1;__STDC_FORMAT_MACROS=1;__STDC_LIMIT_MACROS=1;__STDC_CONSTANT_MACROS=1;_HAS_EXCEPTIONS=1;MDBX_CONFIG_H=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>LIBMDBX_EXPORTS;MDBX_DEBUG=1;__STDC_FORMAT_MACROS=1;__STDC_LIMIT_MACROS=1;__STDC_CONSTANT_MACROS=1;_HAS_EXCEPTIONS=1;MDBX_CONFIG_H=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -45,6 +53,9 @@
<ClCompile Include="src\src\lck-windows.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
+ <ClCompile Include="src\src\miranda.c">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ </ClCompile>
<ClCompile Include="src\src\osal.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
diff --git a/libs/libmdbx/libmdbx.vcxproj.filters b/libs/libmdbx/libmdbx.vcxproj.filters
index df68382a06..fafad41329 100644
--- a/libs/libmdbx/libmdbx.vcxproj.filters
+++ b/libs/libmdbx/libmdbx.vcxproj.filters
@@ -14,6 +14,9 @@
<ClCompile Include="src\src\core.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="src\src\miranda.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\config.h">
@@ -22,8 +25,5 @@
<ClInclude Include="src\mdbx.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="src\stdafx.h">
- <Filter>Header Files</Filter>
- </ClInclude>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/libs/libmdbx/mdbx_chk.vcxproj b/libs/libmdbx/mdbx_chk.vcxproj
index 8ef370cbd9..2a87e619ee 100644
--- a/libs/libmdbx/mdbx_chk.vcxproj
+++ b/libs/libmdbx/mdbx_chk.vcxproj
@@ -27,7 +27,7 @@
</ImportGroup>
<ItemDefinitionGroup>
<ClCompile>
- <PreprocessorDefinitions>MDBX_DEBUG=1;__STDC_FORMAT_MACROS=1;__STDC_LIMIT_MACROS=1;__STDC_CONSTANT_MACROS=1;_HAS_EXCEPTIONS=1;MDBX_CONFIG_H=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>LIBMDBX_IMPORTS;MDBX_DEBUG=1;__STDC_FORMAT_MACROS=1;__STDC_LIMIT_MACROS=1;__STDC_CONSTANT_MACROS=1;_HAS_EXCEPTIONS=1;MDBX_CONFIG_H=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/libs/libmdbx/mdbx_dump.vcxproj b/libs/libmdbx/mdbx_dump.vcxproj
index 6589036b21..62038f7ae5 100644
--- a/libs/libmdbx/mdbx_dump.vcxproj
+++ b/libs/libmdbx/mdbx_dump.vcxproj
@@ -27,7 +27,7 @@
</ImportGroup>
<ItemDefinitionGroup>
<ClCompile>
- <PreprocessorDefinitions>MDBX_DEBUG=1;__STDC_FORMAT_MACROS=1;__STDC_LIMIT_MACROS=1;__STDC_CONSTANT_MACROS=1;_HAS_EXCEPTIONS=1;MDBX_CONFIG_H=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>LIBMDBX_IMPORTS;MDBX_DEBUG=1;__STDC_FORMAT_MACROS=1;__STDC_LIMIT_MACROS=1;__STDC_CONSTANT_MACROS=1;_HAS_EXCEPTIONS=1;MDBX_CONFIG_H=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/libs/libmdbx/mdbx_load.vcxproj b/libs/libmdbx/mdbx_load.vcxproj
index b0545c6dc1..bb51bcfe32 100644
--- a/libs/libmdbx/mdbx_load.vcxproj
+++ b/libs/libmdbx/mdbx_load.vcxproj
@@ -27,7 +27,7 @@
</ImportGroup>
<ItemDefinitionGroup>
<ClCompile>
- <PreprocessorDefinitions>MDBX_DEBUG=1;__STDC_FORMAT_MACROS=1;__STDC_LIMIT_MACROS=1;__STDC_CONSTANT_MACROS=1;_HAS_EXCEPTIONS=1;MDBX_CONFIG_H=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>LIBMDBX_IMPORTS;MDBX_DEBUG=1;__STDC_FORMAT_MACROS=1;__STDC_LIMIT_MACROS=1;__STDC_CONSTANT_MACROS=1;_HAS_EXCEPTIONS=1;MDBX_CONFIG_H=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/libs/libmdbx/src/config.h b/libs/libmdbx/src/config.h
index 960cb22fca..9d21e964d5 100644
--- a/libs/libmdbx/src/config.h
+++ b/libs/libmdbx/src/config.h
@@ -28,6 +28,7 @@
/* Windows */
#define MDBX_AVOID_CRT 0
+#define MDBX_CONFIG_MANUAL_TLS_CALLBACK 1
/* MacOS & iOS */
#define MDBX_OSX_SPEED_INSTEADOF_DURABILITY 0
diff --git a/libs/libmdbx/src/src/miranda.c b/libs/libmdbx/src/src/miranda.c
new file mode 100644
index 0000000000..df8c2dd620
--- /dev/null
+++ b/libs/libmdbx/src/src/miranda.c
@@ -0,0 +1,11 @@
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+#include "../config.h"
+#include "../mdbx.h"
+
+BOOL APIENTRY DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
+{
+ mdbx_dll_handler(hModule, ul_reason_for_call, lpReserved);
+ return TRUE;
+}
diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp
index 6e9532f480..be7728d691 100644
--- a/plugins/PluginUpdater/src/DlgUpdate.cpp
+++ b/plugins/PluginUpdater/src/DlgUpdate.cpp
@@ -565,7 +565,6 @@ static renameTable[] =
{ L"gtalkext.dll", nullptr },
{ L"importtxt.dll", nullptr },
{ L"langman.dll", nullptr },
- { L"libmdbx.mir", nullptr },
{ L"libtox.dll", nullptr },
{ L"metacontacts.dll", nullptr },
{ L"mra.dll", nullptr },
@@ -582,6 +581,8 @@ static renameTable[] =
{ L"yahoogroups.dll", nullptr },
{ L"yapp.dll", nullptr },
{ L"WART-*.exe", nullptr },
+
+ { L"Libs\\libmdbx.mir", nullptr },
};
// Checks if file needs to be renamed and copies it in pNewName
diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt
index 9e7ffc5bcd..b9ed9978c0 100644
--- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt
+++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt
@@ -1,5 +1,6 @@
hashes.txt
fixme.cmd
+libmdbx.mir
mdbx_chk.exe
mdbx_load.exe
mdbx_dump.exe
@@ -8,7 +9,6 @@ pu_stub.exe
sendlog.exe
sendlogwin.exe
-
Plugins\actman.dll
Plugins\addcontactplus.dll
Plugins\alarms.dll
diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt
index 83935282aa..3aefdae76f 100644
--- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt
+++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt
@@ -1,5 +1,6 @@
hashes.txt
fixme.cmd
+libmdbx.mir
mdbx_chk.exe
mdbx_dump.exe
mdbx_load.exe
diff --git a/tools/build_scripts/bin15/z3_PackArchives.txt b/tools/build_scripts/bin15/z3_PackArchives.txt
index 209259021d..a7e0ff165f 100644
--- a/tools/build_scripts/bin15/z3_PackArchives.txt
+++ b/tools/build_scripts/bin15/z3_PackArchives.txt
@@ -42,6 +42,7 @@ Libs\msvcp140.dll
Libs\ucrtbase.dll
Libs\vcruntime140.dll
fixme.cmd
+libmdbx.mir
mirandaboot.ini
mdbx_chk.exe
mdbx_load.exe
diff --git a/tools/build_scripts/z2_PackPluginUpdater.txt b/tools/build_scripts/z2_PackPluginUpdater.txt
index 655ac12274..c00a21e244 100644
--- a/tools/build_scripts/z2_PackPluginUpdater.txt
+++ b/tools/build_scripts/z2_PackPluginUpdater.txt
@@ -61,6 +61,7 @@ Plugins\Import.dll
Icons\Proto_Dummy.dll
Icons\Proto_MetaContacts.dll
fixme.cmd
+libmdbx.mir
mdbx_chk.exe
mdbx_load.exe
mdbx_dump.exe
diff --git a/tools/installer_ng/MirandaNG.iss b/tools/installer_ng/MirandaNG.iss
index 254f506d62..20d02558c8 100644
--- a/tools/installer_ng/MirandaNG.iss
+++ b/tools/installer_ng/MirandaNG.iss
@@ -65,6 +65,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\libmdbx.mir"; DestDir: "{app}"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Libs\*.dll"; DestDir: "{app}\Libs"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Libs\FreeImage.mir"; DestDir: "{app}\Libs"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Libs\libeay32.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 3dbdeeee1a..e6e7353c8d 100644
--- a/tools/installer_ng_stable/MirandaNG.iss
+++ b/tools/installer_ng_stable/MirandaNG.iss
@@ -67,6 +67,7 @@ Source: "Files\Icons\Toolbar_icons.dll"; DestDir: "{app}\Icons"; Components: cli
Source: "Files\{#MirName}"; DestDir: "{app}"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Libs\*.dll"; DestDir: "{app}\Libs"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Libs\FreeImage.mir"; DestDir: "{app}\Libs"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
+Source: "Files\Libs\libmdbx.mir"; DestDir: "{app}\Libs"; Components: program; 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()
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-29 19:53:26 +0000