diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-02-04 11:05:57 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-02-04 11:05:59 -0500 |
| commit | 6a5feb7d821f1d5a3c0c1fc808ab8707f581ea76 (patch) | |
| tree | 690ef726cf824431500a66f36c1f7a1f1f9e8eb7 | |
| parent | ebc6542d982c5fb7ad965ce3b365800a44e0e635 (diff) | |
| parent | bef8fdd6e2293efdaf05f804a8cff69380c8665e (diff) | |
| download | bitcoin-6a5feb7d821f1d5a3c0c1fc808ab8707f581ea76.tar.xz | |
Merge #15325: msvc: Fix silent merge conflict between #13926 and #14372
bef8fdd6e2 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
| -rw-r--r-- | build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj b/build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj index b618aca817..367e68ee51 100644 --- a/build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj +++ b/build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj @@ -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> |