diff options
| author | Aaron Clauson <aaron@sipsorcery.com> | 2019-11-10 13:49:28 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-01-06 06:34:33 +0800 |
| commit | b0f9b8e648733c3c5196fbb85fade88fa7ba9449 (patch) | |
| tree | 90f9875c721a863cea73f885e32c3e105c47f4b3 /build_msvc | |
| parent | cd7b3b254a9d782667c751ade64c329edc30ecbb (diff) | |
Moves vcpkg list to a text file and updates the appveyor job and readme to use it.
Github-Pull: #17416
Rebased-From: 29eb039252f35a3bb58b0027f172cfe3d0c79867
Diffstat (limited to 'build_msvc')
| -rw-r--r-- | build_msvc/README.md | 11 | ||||
| -rw-r--r-- | build_msvc/vcpkg-packages.txt | 1 |
2 files changed, 7 insertions, 5 deletions
diff --git a/build_msvc/README.md b/build_msvc/README.md index 88b1f514bd..6c3ab6f6b0 100644 --- a/build_msvc/README.md +++ b/build_msvc/README.md @@ -56,11 +56,12 @@ Building --------------------- The instructions below use `vcpkg` to install the dependencies. -- Clone `vcpkg` from the [github repository](https://github.com/Microsoft/vcpkg) and install as per the instructions in the main README.md. -- Install the required packages (replace x64 with x86 as required): +- Install [`vcpkg`](https://github.com/Microsoft/vcpkg). +- Install the required packages (replace x64 with x86 as required). The list of required packages can be found in the `build_msvc\vcpkg-packages.txt` file. The PowerShell command below will work if run from the repository root directory and `vcpkg` is in the path. Alternatively the contents of the packages text file can be pasted in place of the `Get-Content` cmdlet. ``` - PS >.\vcpkg install --triplet x64-windows-static boost-filesystem boost-signals2 boost-test libevent openssl zeromq berkeleydb rapidcheck double-conversion +PS >.\vcpkg install --triplet x64-windows-static $(Get-Content -Path build_msvc\vcpkg-packages.txt).split() + ``` - Use Python to generate *.vcxproj from Makefile @@ -74,13 +75,13 @@ The instructions below use `vcpkg` to install the dependencies. - Build with Visual Studio 2017 or msbuild. ``` -msbuild /m bitcoin.sln /p:Platform=x64 /p:Configuration=Release /t:build +msbuild /m bitcoin.sln /p:Platform=x64 /p:Configuration=Release /p:PlatformToolset=v141 /t:build ``` - Build with Visual Studio 2019 or msbuild. ``` -msbuild /m bitcoin.sln /p:Platform=x64 /p:Configuration=Release /p:PlatformToolset=v142 /t:build +msbuild /m bitcoin.sln /p:Platform=x64 /p:Configuration=Release /t:build ``` AppVeyor diff --git a/build_msvc/vcpkg-packages.txt b/build_msvc/vcpkg-packages.txt new file mode 100644 index 0000000000..082a13f1cf --- /dev/null +++ b/build_msvc/vcpkg-packages.txt @@ -0,0 +1 @@ +berkeleydb boost-filesystem boost-multi-index boost-signals2 boost-test boost-thread libevent openssl rapidcheck zeromq double-conversion
\ No newline at end of file |