msvc: Fix silent merge conflict between #13926 and #14372 #15325

pull ken2812221 wants to merge 1 commits into bitcoin:master from ken2812221:msvc-merge-conflict changing 1 files +3 −0
  1. ken2812221 commented at 11:12 PM on February 1, 2019: contributor

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

  2. msvc: Fix silent merge conflict between #13926 and #14372 bef8fdd6e2
  3. MarcoFalke added this to the milestone 0.18.0 on Feb 1, 2019
  4. MarcoFalke commented at 11:17 PM on February 1, 2019: member
  5. MarcoFalke added the label Windows on Feb 1, 2019
  6. MarcoFalke commented at 4:41 AM on February 3, 2019: member
  7. NicolasDorier commented at 5:50 AM on February 3, 2019: contributor

    tACK

  8. ken2812221 commented at 6:45 AM on February 3, 2019: contributor

    @MarcoFalke I think that MSVC is trying to link with vcpkg's secp256k1 library that is in the cache.

    error if we clear the cache: https://ci.appveyor.com/project/ken2812221/bitcoin/builds/22067759

  9. sipsorcery commented at 10:34 AM on February 3, 2019: member

    tACK bef8fdd6e2293efdaf05f804a8cff69380c8665e.

  10. MarcoFalke referenced this in commit 6a5feb7d82 on Feb 4, 2019
  11. MarcoFalke merged this on Feb 4, 2019
  12. MarcoFalke closed this on Feb 4, 2019

  13. ken2812221 deleted the branch on Feb 4, 2019
  14. MarcoFalke referenced this in commit e3b1c7a9d6 on Feb 14, 2019
  15. MarcoFalke locked this on Dec 16, 2021

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-04-13 21:14 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me