From a519d4617ed83a2167a693ae87934e56889fef05 Mon Sep 17 00:00:00 2001 From: Leonid Yuriev Date: Thu, 8 Oct 2020 02:02:18 +0300 Subject: libmdbx: switch to original amalgamated source code (v0.9.1.18) Amalgamated source code is the recommended form for embedding libmdbx in non-CMake build systems. This amalgamated version contains a minimum of files, is fully ready for use, and make impossible a number of errors. To upgrade or switch to a different version, just unpack to the `src` subdirectory a corresponding `libmdbx-amalgamated-X_Y_Z.zip` at the https://github.com/erthink/libmdbx/releases. For instance, the https://github.com/erthink/libmdbx/releases/download/v0.9.2/libmdbx-amalgamated-0_9_2.zip for the next release. -- Minimal changes have been made to the build configuration: 1. For use the standard `DllMain()` entry of libmdbx: - added the `MDBX_BUILD_SHARED_LIBRARY=1` option; - removed the `MDBX_CONFIG_MANUAL_TLS_CALLBACK` option; - deleted the `miranda.c` file containing only `DllMain()` with the `mdbx_dll_handle()` call, now this is done by the library itself. 2. Removed refs to extra files (that missing in the amalgamated source code): - for building `libmdbx.dll` only the `mdbx.h` and `mdbx.c` are used, but not `mdbx.c++` for a C++ API; - for building the `mdbx_chk`, `mdbx_load`, and `mdbx_dump` utilities only it own sources are used. -- Last libmdbx changes: - Fixed missing installation of `mdbx.h++`. - Fixed use of obsolete `__noreturn`. - Fixed use of `yield` instruction on ARM if unsupported. - Added pthread workaround for buggy toolchain/cmake/buildroot. - Fixed use of `pthread_yield()` for non-GLIBC. - Fixed use of `RegGetValueA()` on Windows 2000/XP. - Fixed use of `GetTickCount64()` on Windows 2000/XP. - Fixed opening DB on a network shares (in the exclusive mode). - Fixed copy&paste typos. - Fixed minor false-positive GCC warning. --- libs/libmdbx/mdbx_chk.vcxproj | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'libs/libmdbx/mdbx_chk.vcxproj') diff --git a/libs/libmdbx/mdbx_chk.vcxproj b/libs/libmdbx/mdbx_chk.vcxproj index e84eb20b93..f07ada1150 100644 --- a/libs/libmdbx/mdbx_chk.vcxproj +++ b/libs/libmdbx/mdbx_chk.vcxproj @@ -27,7 +27,7 @@ - LIBMDBX_IMPORTS;MDBX_DEBUG=1;__STDC_FORMAT_MACROS=1;__STDC_LIMIT_MACROS=1;__STDC_CONSTANT_MACROS=1;_HAS_EXCEPTIONS=1;MDBX_CONFIG_H="..\config.h";%(PreprocessorDefinitions) + LIBMDBX_IMPORTS;%(PreprocessorDefinitions) ntdll.lib;%(AdditionalDependencies) @@ -37,10 +37,7 @@ - - NotUsing - - + NotUsing -- cgit v1.2.3