Skip to content

Commit 6a5feb7

Browse files
author
MarcoFalke
committed
Merge #15325: msvc: Fix silent merge conflict between #13926 and #14372
bef8fdd msvc: Fix silent merge conflict between #13926 and #14372 (ken2812221) Pull request description: The bitcoin-wallet.exe would have to link with libsecp256k1 after we build libsecp256k1 in project. Tree-SHA512: cb3fafa301f39121f5d26ac8ac6009c9665fcad1061dbf14ba013104870abe5413ac57c97c97df12b6ba2ad709b776c51aeec20d41f3ae01d3460a5e18f40eec
2 parents ebc6542 + bef8fdd commit 6a5feb7

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@
5353
<ProjectReference Include="..\libbitcoin_wallet_tool\libbitcoin_wallet_tool.vcxproj">
5454
<Project>{f91ac55e-6f5e-4c58-9ac5-b40db7deef93}</Project>
5555
</ProjectReference>
56+
<ProjectReference Include="..\libsecp256k1\libsecp256k1.vcxproj">
57+
<Project>{bb493552-3b8c-4a8c-bf69-a6e7a51d2ea6}</Project>
58+
</ProjectReference>
5659
</ItemGroup>
5760
<PropertyGroup Label="Globals">
5861
<VCProjectVersion>15.0</VCProjectVersion>

0 commit comments

Comments
 (0)