diff options
| author | fanquake <fanquake@gmail.com> | 2023-05-18 11:34:15 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-05-18 11:34:34 +0100 |
| commit | 87d6f6c29dbb011c85d6a1c191d13acd5522a2c6 (patch) | |
| tree | 99ad4d342c9a602acd2b724d9f86b6a5a0b78aed /build_msvc/test_bitcoin-qt | |
| parent | 8146f2a035f4d4c22513ff82db307326fb93638c (diff) | |
| parent | a94d75fa81bab8f4695ab1756524e639af0ff69c (diff) | |
| download | bitcoin-87d6f6c29dbb011c85d6a1c191d13acd5522a2c6.tar.xz | |
Merge bitcoin/bitcoin#27615: msvc: Rename `libbitcoinconsensus` to `libbitcoin_consensus` and other adjustments
a94d75fa81bab8f4695ab1756524e639af0ff69c msvc: Do not define `HAVE_CONSENSUS_LIB` (Hennadii Stepanov)
cf6ff1031bd577c18fe8eb2dd168a6d0d1c16e0d msvc: Clean up `libbitcoin_consensus` source files (Hennadii Stepanov)
30aee016f15b43b90efb023d9bd04aa84cf58ade scripted-diff: Rename `libbitcoinconsensus` to `libbitcoin_consensus` (Hennadii Stepanov)
Pull request description:
The current Autotools-based build system operates with two build artifacts:
- [`LIBBITCOIN_CONSENSUS`](https://github.com/bitcoin/bitcoin/blob/3777c75d147954b24f770dc7781b27870eadf775/src/Makefile.am#L31) which is [defined as](https://github.com/bitcoin/bitcoin/blob/master/doc/design/libraries.md) "Stable, backwards-compatible consensus functionality used by _libbitcoin_node_ and _libbitcoin_wallet_"
- [`LIBBITCOINCONSENSUS`](https://github.com/bitcoin/bitcoin/blob/3777c75d147954b24f770dc7781b27870eadf775/src/Makefile.am#L42) which is [defined as](https://github.com/bitcoin/bitcoin/blob/master/doc/design/libraries.md) "Shared library build of static _libbitcoin_consensus_ library"
The way how the `libbitcoinconsensus.vcxproj` project is used in the MSVC build system obviously shows that it is the former use case.
This PR makes the related adjustments to the MSVC build system.
ACKs for top commit:
sipsorcery:
ACK a94d75fa81bab8f4695ab1756524e639af0ff69c.
Tree-SHA512: 1144e13ee2b428ce14be8f76729744830c502a07814eb03e2aa6b8e009d8936fd13743e3f36ef3f31fac0e3979eb9af23e6a1364f151df49b3ae18dbd14cbf99
Diffstat (limited to 'build_msvc/test_bitcoin-qt')
| -rw-r--r-- | build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj b/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj index 045386ea17..ac4518e0f2 100644 --- a/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj +++ b/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj @@ -28,7 +28,7 @@ <ClCompile Include="$(GeneratedFilesOutDir)\moc\moc_wallettests.cpp" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\libbitcoinconsensus\libbitcoinconsensus.vcxproj"> + <ProjectReference Include="..\libbitcoin_consensus\libbitcoin_consensus.vcxproj"> <Project>{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}</Project> </ProjectReference> <ProjectReference Include="..\libbitcoin_cli\libbitcoin_cli.vcxproj"> |