Skip to content

Commit

Permalink
Merge bitcoin#15325: msvc: Fix silent merge conflict between bitcoin#…
Browse files Browse the repository at this point in the history
…13926 and bitcoin#14372

bef8fdd msvc: Fix silent merge conflict between bitcoin#13926 and bitcoin#14372 (ken2812221)

Pull request description:

  The bitcoin-wallet.exe would have to link with libsecp256k1 after we build libsecp256k1 in project.

Tree-SHA512: cb3fafa301f39121f5d26ac8ac6009c9665fcad1061dbf14ba013104870abe5413ac57c97c97df12b6ba2ad709b776c51aeec20d41f3ae01d3460a5e18f40eec
  • Loading branch information
MarcoFalke committed Feb 4, 2019
2 parents ebc6542 + bef8fdd commit 6a5feb7
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@
<ProjectReference Include="..\libbitcoin_wallet_tool\libbitcoin_wallet_tool.vcxproj">
<Project>{f91ac55e-6f5e-4c58-9ac5-b40db7deef93}</Project>
</ProjectReference>
<ProjectReference Include="..\libsecp256k1\libsecp256k1.vcxproj">
<Project>{bb493552-3b8c-4a8c-bf69-a6e7a51d2ea6}</Project>
</ProjectReference>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>15.0</VCProjectVersion>
Expand Down

0 comments on commit 6a5feb7

Please sign in to comment.