Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions builds/cmake/install-cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
# Default: OFF
# -Denable-shani=<ON/OFF> Use Intel/ARM SHA Extensions.
# Default: OFF
# -Denable-crypto=<ON/OFF> Use ARM Crypto Extensions.
# Default: OFF
# -Dwith-ultrafast=<ON/OFF> Use shrec/UltrafastSecp256k1 library.
# Default: OFF
# -Dwith-secp256k1=<ON/OFF> Use bitcoin-core/secp256k1 library.
Expand Down Expand Up @@ -1058,6 +1060,8 @@ help()
msg " Default: OFF"
msg "-Denable-shani=<ON/OFF> Use Intel/ARM SHA Extensions."
msg " Default: OFF"
msg "-Denable-crypto=<ON/OFF> Use ARM Crypto Extensions."
msg " Default: OFF"
msg "-Dwith-ultrafast=<ON/OFF> Use shrec/UltrafastSecp256k1 library."
msg " Default: OFF"
msg "-Dwith-secp256k1=<ON/OFF> Use bitcoin-core/secp256k1 library."
Expand Down
4 changes: 4 additions & 0 deletions builds/cmake/install-presets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
# Default: OFF
# -Denable-shani=<ON/OFF> Use Intel/ARM SHA Extensions.
# Default: OFF
# -Denable-crypto=<ON/OFF> Use ARM Crypto Extensions.
# Default: OFF
# -Dwith-ultrafast=<ON/OFF> Use shrec/UltrafastSecp256k1 library.
# Default: OFF
# -Dwith-secp256k1=<ON/OFF> Use bitcoin-core/secp256k1 library.
Expand Down Expand Up @@ -1136,6 +1138,8 @@ help()
msg " Default: OFF"
msg "-Denable-shani=<ON/OFF> Use Intel/ARM SHA Extensions."
msg " Default: OFF"
msg "-Denable-crypto=<ON/OFF> Use ARM Crypto Extensions."
msg " Default: OFF"
msg "-Dwith-ultrafast=<ON/OFF> Use shrec/UltrafastSecp256k1 library."
msg " Default: OFF"
msg "-Dwith-secp256k1=<ON/OFF> Use bitcoin-core/secp256k1 library."
Expand Down
4 changes: 4 additions & 0 deletions builds/gnu/install-gnu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
# Default: --disable-sse41
# --<enable/disable>-shani Use Intel/ARM SHA Extensions.
# Default: --disable-shani
# --<enable/disable>-crypto Use ARM Crypto Extensions.
# Default: --disable-crypto
# --<with/without>-ultrafast Use shrec/UltrafastSecp256k1 library.
# Default: --without-ultrafast
# --<with/without>-secp256k1 Use bitcoin-core/secp256k1 library.
Expand Down Expand Up @@ -1293,6 +1295,8 @@ help()
msg " Default: --disable-sse41"
msg "--<enable/disable>-shani Use Intel/ARM SHA Extensions."
msg " Default: --disable-shani"
msg "--<enable/disable>-crypto Use ARM Crypto Extensions."
msg " Default: --disable-crypto"
msg "--<with/without>-ultrafast Use shrec/UltrafastSecp256k1 library."
msg " Default: --without-ultrafast"
msg "--<with/without>-secp256k1 Use bitcoin-core/secp256k1 library."
Expand Down
32 changes: 32 additions & 0 deletions builds/msvc/build-msvc.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ REM ###########################################################################
REM Script managing the build of libbitcoin-node.
REM
REM Script options:
REM --enable-avx2 Use Intel AVX2 intrinsics.
REM --enable-avx512 Use Intel AVX512 intrinsics.
REM --enable-sse41 Use SSE4.1 hardware instructions.
REM --enable-shani Use Intel/ARM SHA Extensions.
REM --enable-crypto Use ARM Crypto Extensions.
REM --build-config config Build configuration.
REM --build-platform platform Build platform.
REM --build-version version Build MSVC version.
Expand Down Expand Up @@ -233,12 +237,36 @@ if "!libbitcoin_node_TAG!" == "" (
:parse_input
if "%~1" == "" (
goto :end_parse_input
) else if "%~1" == "--enable-avx2" (
if "!libbitcoin-system_PARAMS!" == "" (
set "libbitcoin-system_PARAMS=/p:Option-arch=AdvancedVectorExtensions2"
) else (
set "libbitcoin-system_PARAMS=!libbitcoin-system_PARAMS! /p:Option-arch=AdvancedVectorExtensions2"
)
) else if "%~1" == "--enable-avx512" (
if "!libbitcoin-system_PARAMS!" == "" (
set "libbitcoin-system_PARAMS=/p:Option-arch=AdvancedVectorExtensions512"
) else (
set "libbitcoin-system_PARAMS=!libbitcoin-system_PARAMS! /p:Option-arch=AdvancedVectorExtensions512"
)
) else if "%~1" == "--enable-sse41" (
if "!libbitcoin-system_PARAMS!" == "" (
set "libbitcoin-system_PARAMS=/p:Option-arch=AdvancedVectorExtensions"
) else (
set "libbitcoin-system_PARAMS=!libbitcoin-system_PARAMS! /p:Option-arch=AdvancedVectorExtensions"
)
) else if "%~1" == "--enable-shani" (
if "!libbitcoin-system_PARAMS!" == "" (
set "libbitcoin-system_PARAMS=/p:Option-sha=true"
) else (
set "libbitcoin-system_PARAMS=!libbitcoin-system_PARAMS! /p:Option-sha=true"
)
) else if "%~1" == "--enable-crypto" (
if "!libbitcoin-system_PARAMS!" == "" (
set "libbitcoin-system_PARAMS=/p:Option-sha=true"
) else (
set "libbitcoin-system_PARAMS=!libbitcoin-system_PARAMS! /p:Option-sha=true"
)
) else if "%~1" == "--build-config" (
set "BUILD_CONFIG=%~2"
shift
Expand Down Expand Up @@ -482,7 +510,11 @@ if "!libbitcoin_node_TAG!" == "" (
call :msg "Script managing the build of libbitcoin-node."
call :msg ""
call :msg "Script options:"
call :msg "--enable-avx2 Use Intel AVX2 intrinsics."
call :msg "--enable-avx512 Use Intel AVX512 intrinsics."
call :msg "--enable-sse41 Use SSE4.1 hardware instructions."
call :msg "--enable-shani Use Intel/ARM SHA Extensions."
call :msg "--enable-crypto Use ARM Crypto Extensions."
call :msg "--build-config config Build configuration."
call :msg "--build-platform platform Build platform."
call :msg "--build-version version Build MSVC version."
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/properties/Release.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<!-- Overridable per machine (e.g. Directory.Build.props above repos, or environment). -->
<PropertyGroup>
<Option-arch Condition="'$(Option-arch)' == ''">AdvancedVectorExtensions2</Option-arch>
<Option-arch Condition="'$(Option-arch)' == '' And ('$(Platform)' == 'x64' Or '$(Platform)' == 'Win32')">AdvancedVectorExtensions2</Option-arch>
</PropertyGroup>

<!-- DebugInformationFormat and GenerateDebugInformation were formerly disabled. -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_unit_test_framework-vc145.1.91.0\build\libbitcoin-boost_unit_test_framework-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_unit_test_framework-vc145.1.91.0\build\libbitcoin-boost_unit_test_framework-vc145.targets')" />
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1_vc145.0.8.0\build\native\secp256k1_vc145.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc145.0.8.0\build\native\secp256k1_vc145.targets')" />
<Import Project="$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.5.0.3\build\native\UltrafastSecp256k1-vc145.targets" Condition="Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.5.0.3\build\native\UltrafastSecp256k1-vc145.targets')" />
<Import Project="$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.6.0.0\build\native\UltrafastSecp256k1-vc145.targets" Condition="Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.6.0.0\build\native\UltrafastSecp256k1-vc145.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
Expand All @@ -179,7 +179,7 @@
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_unit_test_framework-vc145.1.91.0\build\libbitcoin-boost_unit_test_framework-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_unit_test_framework-vc145.1.91.0\build\libbitcoin-boost_unit_test_framework-vc145.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc145.0.8.0\build\native\secp256k1_vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc145.0.8.0\build\native\secp256k1_vc145.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.5.0.3\build\native\UltrafastSecp256k1-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.5.0.3\build\native\UltrafastSecp256k1-vc145.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.6.0.0\build\native\UltrafastSecp256k1-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.6.0.0\build\native\UltrafastSecp256k1-vc145.targets'))" />
</Target>
<ItemGroup>
<ProjectReference Include="..\libbitcoin-node\libbitcoin-node.vcxproj">
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2026/libbitcoin-node-test/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
|
-->
<packages>
<package id="UltrafastSecp256k1-vc145" version="4.5.0.3" targetFramework="Native" />
<package id="UltrafastSecp256k1-vc145" version="4.6.0.0" targetFramework="Native" />
<package id="libbitcoin-boost" version="1.91.0" targetFramework="Native" />
<package id="libbitcoin-boost_container-vc145" version="1.91.0" targetFramework="Native" />
<package id="libbitcoin-boost_iostreams-vc145" version="1.91.0" targetFramework="Native" />
Expand Down
4 changes: 2 additions & 2 deletions builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_thread-vc145.1.91.0\build\libbitcoin-boost_thread-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_thread-vc145.1.91.0\build\libbitcoin-boost_thread-vc145.targets')" />
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1_vc145.0.8.0\build\native\secp256k1_vc145.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc145.0.8.0\build\native\secp256k1_vc145.targets')" />
<Import Project="$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.5.0.3\build\native\UltrafastSecp256k1-vc145.targets" Condition="Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.5.0.3\build\native\UltrafastSecp256k1-vc145.targets')" />
<Import Project="$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.6.0.0\build\native\UltrafastSecp256k1-vc145.targets" Condition="Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.6.0.0\build\native\UltrafastSecp256k1-vc145.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
Expand All @@ -263,7 +263,7 @@
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_thread-vc145.1.91.0\build\libbitcoin-boost_thread-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_thread-vc145.1.91.0\build\libbitcoin-boost_thread-vc145.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc145.0.8.0\build\native\secp256k1_vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc145.0.8.0\build\native\secp256k1_vc145.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.5.0.3\build\native\UltrafastSecp256k1-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.5.0.3\build\native\UltrafastSecp256k1-vc145.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.6.0.0\build\native\UltrafastSecp256k1-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.6.0.0\build\native\UltrafastSecp256k1-vc145.targets'))" />
</Target>
<ItemGroup>
<Natvis Include="..\..\debug.natvis" />
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2026/libbitcoin-node/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
|
-->
<packages>
<package id="UltrafastSecp256k1-vc145" version="4.5.0.3" targetFramework="Native" />
<package id="UltrafastSecp256k1-vc145" version="4.6.0.0" targetFramework="Native" />
<package id="libbitcoin-boost" version="1.91.0" targetFramework="Native" />
<package id="libbitcoin-boost_container-vc145" version="1.91.0" targetFramework="Native" />
<package id="libbitcoin-boost_iostreams-vc145" version="1.91.0" targetFramework="Native" />
Expand Down
Loading