aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorken2812221 <[email protected]>2019-02-02 05:58:56 +0800
committerGitHub <[email protected]>2019-02-02 05:58:56 +0800
commitbef8fdd6e2293efdaf05f804a8cff69380c8665e (patch)
treebf722c07918e676f56010aef1c73f8bb0917d109
parentMerge #15308: build: Restore compatibility with older boost (diff)
downloaddiscoin-bef8fdd6e2293efdaf05f804a8cff69380c8665e.tar.xz
discoin-bef8fdd6e2293efdaf05f804a8cff69380c8665e.zip
msvc: Fix silent merge conflict between #13926 and #14372
-rw-r--r--build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj3
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 b618aca81..367e68ee5 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>