From 603487bf0897c62e42cc69b5f411a5dbe9737e28 Mon Sep 17 00:00:00 2001
From: Eric Voskuil <eric@voskuil.org>
Date: Mon, 20 Jul 2026 17:03:50 -0400
Subject: [PATCH] Make vs secp256k1, ultrafast, and uf/cuda options importable.

---
 .../libbitcoin-database-test.props                   | 12 +++++++++---
 .../libbitcoin-database-tools.props                  | 12 +++++++++---
 .../libbitcoin-database/libbitcoin-database.props    | 12 +++++++++---
 builds/msvc/vs2022/libbitcoin-system.import.props    |  6 ++++++
 .../libbitcoin-database-test.props                   | 12 +++++++++---
 .../libbitcoin-database-tools.props                  | 12 +++++++++---
 .../libbitcoin-database/libbitcoin-database.props    | 12 +++++++++---
 builds/msvc/vs2026/libbitcoin-system.import.props    |  6 ++++++
 8 files changed, 66 insertions(+), 18 deletions(-)

diff --git a/builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.props b/builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.props
index 24a008724..99e97d83b 100644
--- a/builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.props
+++ b/builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.props
@@ -31,20 +31,26 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-secp256k1>dynamic</Linkage-secp256k1>
+    <Linkage-secp256k1 Condition="'$(Option-secp256k1)' != 'false'">dynamic</Linkage-secp256k1>
+    <Linkage-ultrafast Condition="'$(Option-ultrafast)' == 'true'">dynamic</Linkage-ultrafast>
     <Linkage-libbitcoin-system>dynamic</Linkage-libbitcoin-system>
     <Linkage-libbitcoin-database>dynamic</Linkage-libbitcoin-database>
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-secp256k1>ltcg</Linkage-secp256k1>
+    <Linkage-secp256k1 Condition="'$(Option-secp256k1)' != 'false'">ltcg</Linkage-secp256k1>
+    <Linkage-ultrafast Condition="'$(Option-ultrafast)' == 'true'">ltcg</Linkage-ultrafast>
     <Linkage-libbitcoin-system>ltcg</Linkage-libbitcoin-system>
     <Linkage-libbitcoin-database>ltcg</Linkage-libbitcoin-database>
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-secp256k1>static</Linkage-secp256k1>
+    <Linkage-secp256k1 Condition="'$(Option-secp256k1)' != 'false'">static</Linkage-secp256k1>
+    <Linkage-ultrafast Condition="'$(Option-ultrafast)' == 'true'">static</Linkage-ultrafast>
     <Linkage-libbitcoin-system>static</Linkage-libbitcoin-system>
     <Linkage-libbitcoin-database>static</Linkage-libbitcoin-database>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Option-ultrafast)' == 'true' And '$(Option-cuda)' == 'true'">
+    <Linkage-ultrafast>cuda</Linkage-ultrafast>
+  </PropertyGroup>
 
   <!-- Messages -->
 
diff --git a/builds/msvc/vs2022/libbitcoin-database-tools/libbitcoin-database-tools.props b/builds/msvc/vs2022/libbitcoin-database-tools/libbitcoin-database-tools.props
index e96ef6e29..80ec6f538 100644
--- a/builds/msvc/vs2022/libbitcoin-database-tools/libbitcoin-database-tools.props
+++ b/builds/msvc/vs2022/libbitcoin-database-tools/libbitcoin-database-tools.props
@@ -28,20 +28,26 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-secp256k1>dynamic</Linkage-secp256k1>
+    <Linkage-secp256k1 Condition="'$(Option-secp256k1)' != 'false'">dynamic</Linkage-secp256k1>
+    <Linkage-ultrafast Condition="'$(Option-ultrafast)' == 'true'">dynamic</Linkage-ultrafast>
     <Linkage-libbitcoin-system>dynamic</Linkage-libbitcoin-system>
     <Linkage-libbitcoin-database>dynamic</Linkage-libbitcoin-database>
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-secp256k1>ltcg</Linkage-secp256k1>
+    <Linkage-secp256k1 Condition="'$(Option-secp256k1)' != 'false'">ltcg</Linkage-secp256k1>
+    <Linkage-ultrafast Condition="'$(Option-ultrafast)' == 'true'">ltcg</Linkage-ultrafast>
     <Linkage-libbitcoin-system>ltcg</Linkage-libbitcoin-system>
     <Linkage-libbitcoin-database>ltcg</Linkage-libbitcoin-database>
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-secp256k1>static</Linkage-secp256k1>
+    <Linkage-secp256k1 Condition="'$(Option-secp256k1)' != 'false'">static</Linkage-secp256k1>
+    <Linkage-ultrafast Condition="'$(Option-ultrafast)' == 'true'">static</Linkage-ultrafast>
     <Linkage-libbitcoin-system>static</Linkage-libbitcoin-system>
     <Linkage-libbitcoin-database>static</Linkage-libbitcoin-database>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Option-ultrafast)' == 'true' And '$(Option-cuda)' == 'true'">
+    <Linkage-ultrafast>cuda</Linkage-ultrafast>
+  </PropertyGroup>
 
   <!-- Messages -->
 
diff --git a/builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.props b/builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.props
index 411f4de3d..a546a5581 100644
--- a/builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.props
+++ b/builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.props
@@ -30,17 +30,23 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-secp256k1>dynamic</Linkage-secp256k1>
+    <Linkage-secp256k1 Condition="'$(Option-secp256k1)' != 'false'">dynamic</Linkage-secp256k1>
+    <Linkage-ultrafast Condition="'$(Option-ultrafast)' == 'true'">dynamic</Linkage-ultrafast>
     <Linkage-libbitcoin-system>dynamic</Linkage-libbitcoin-system>
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-secp256k1>ltcg</Linkage-secp256k1>
+    <Linkage-secp256k1 Condition="'$(Option-secp256k1)' != 'false'">ltcg</Linkage-secp256k1>
+    <Linkage-ultrafast Condition="'$(Option-ultrafast)' == 'true'">ltcg</Linkage-ultrafast>
     <Linkage-libbitcoin-system>ltcg</Linkage-libbitcoin-system>
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-secp256k1>static</Linkage-secp256k1>
+    <Linkage-secp256k1 Condition="'$(Option-secp256k1)' != 'false'">static</Linkage-secp256k1>
+    <Linkage-ultrafast Condition="'$(Option-ultrafast)' == 'true'">static</Linkage-ultrafast>
     <Linkage-libbitcoin-system>static</Linkage-libbitcoin-system>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Option-ultrafast)' == 'true' And '$(Option-cuda)' == 'true'">
+    <Linkage-ultrafast>cuda</Linkage-ultrafast>
+  </PropertyGroup>
 
   <!-- Messages -->
 
diff --git a/builds/msvc/vs2022/libbitcoin-system.import.props b/builds/msvc/vs2022/libbitcoin-system.import.props
index bbf13a736..f5166a0a5 100644
--- a/builds/msvc/vs2022/libbitcoin-system.import.props
+++ b/builds/msvc/vs2022/libbitcoin-system.import.props
@@ -21,6 +21,9 @@
     <!--<Option-256>true</Option-256>-->
     <!--<Option-128>true</Option-128>-->
     <Option-sha Condition="'$(Option-sha)' == ''">false</Option-sha>
+    <Option-secp256k1 Condition="'$(Option-secp256k1)' == ''">true</Option-secp256k1>
+    <Option-ultrafast Condition="'$(Option-ultrafast)' == ''">false</Option-ultrafast>
+    <Option-cuda Condition="'$(Option-cuda)' == ''">false</Option-cuda>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -36,6 +39,9 @@
 
   <Target Name="SystemOptionInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Option-sha        : $(Option-sha)" Importance="high"/>
+    <Message Text="Option-secp256k1  : $(Option-secp256k1)" Importance="high"/>
+    <Message Text="Option-ultrafast  : $(Option-ultrafast)" Importance="high"/>
+    <Message Text="Option-cuda       : $(Option-cuda)" Importance="high"/>
     <!--<Message Text="Option-512        : $(Option-512)" Importance="high"/>-->
     <!--<Message Text="Option-256        : $(Option-256)" Importance="high"/>-->
     <!--<Message Text="Option-128        : $(Option-128)" Importance="high"/>-->
diff --git a/builds/msvc/vs2026/libbitcoin-database-test/libbitcoin-database-test.props b/builds/msvc/vs2026/libbitcoin-database-test/libbitcoin-database-test.props
index 24a008724..99e97d83b 100644
--- a/builds/msvc/vs2026/libbitcoin-database-test/libbitcoin-database-test.props
+++ b/builds/msvc/vs2026/libbitcoin-database-test/libbitcoin-database-test.props
@@ -31,20 +31,26 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-secp256k1>dynamic</Linkage-secp256k1>
+    <Linkage-secp256k1 Condition="'$(Option-secp256k1)' != 'false'">dynamic</Linkage-secp256k1>
+    <Linkage-ultrafast Condition="'$(Option-ultrafast)' == 'true'">dynamic</Linkage-ultrafast>
     <Linkage-libbitcoin-system>dynamic</Linkage-libbitcoin-system>
     <Linkage-libbitcoin-database>dynamic</Linkage-libbitcoin-database>
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-secp256k1>ltcg</Linkage-secp256k1>
+    <Linkage-secp256k1 Condition="'$(Option-secp256k1)' != 'false'">ltcg</Linkage-secp256k1>
+    <Linkage-ultrafast Condition="'$(Option-ultrafast)' == 'true'">ltcg</Linkage-ultrafast>
     <Linkage-libbitcoin-system>ltcg</Linkage-libbitcoin-system>
     <Linkage-libbitcoin-database>ltcg</Linkage-libbitcoin-database>
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-secp256k1>static</Linkage-secp256k1>
+    <Linkage-secp256k1 Condition="'$(Option-secp256k1)' != 'false'">static</Linkage-secp256k1>
+    <Linkage-ultrafast Condition="'$(Option-ultrafast)' == 'true'">static</Linkage-ultrafast>
     <Linkage-libbitcoin-system>static</Linkage-libbitcoin-system>
     <Linkage-libbitcoin-database>static</Linkage-libbitcoin-database>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Option-ultrafast)' == 'true' And '$(Option-cuda)' == 'true'">
+    <Linkage-ultrafast>cuda</Linkage-ultrafast>
+  </PropertyGroup>
 
   <!-- Messages -->
 
diff --git a/builds/msvc/vs2026/libbitcoin-database-tools/libbitcoin-database-tools.props b/builds/msvc/vs2026/libbitcoin-database-tools/libbitcoin-database-tools.props
index e96ef6e29..80ec6f538 100644
--- a/builds/msvc/vs2026/libbitcoin-database-tools/libbitcoin-database-tools.props
+++ b/builds/msvc/vs2026/libbitcoin-database-tools/libbitcoin-database-tools.props
@@ -28,20 +28,26 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-secp256k1>dynamic</Linkage-secp256k1>
+    <Linkage-secp256k1 Condition="'$(Option-secp256k1)' != 'false'">dynamic</Linkage-secp256k1>
+    <Linkage-ultrafast Condition="'$(Option-ultrafast)' == 'true'">dynamic</Linkage-ultrafast>
     <Linkage-libbitcoin-system>dynamic</Linkage-libbitcoin-system>
     <Linkage-libbitcoin-database>dynamic</Linkage-libbitcoin-database>
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-secp256k1>ltcg</Linkage-secp256k1>
+    <Linkage-secp256k1 Condition="'$(Option-secp256k1)' != 'false'">ltcg</Linkage-secp256k1>
+    <Linkage-ultrafast Condition="'$(Option-ultrafast)' == 'true'">ltcg</Linkage-ultrafast>
     <Linkage-libbitcoin-system>ltcg</Linkage-libbitcoin-system>
     <Linkage-libbitcoin-database>ltcg</Linkage-libbitcoin-database>
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-secp256k1>static</Linkage-secp256k1>
+    <Linkage-secp256k1 Condition="'$(Option-secp256k1)' != 'false'">static</Linkage-secp256k1>
+    <Linkage-ultrafast Condition="'$(Option-ultrafast)' == 'true'">static</Linkage-ultrafast>
     <Linkage-libbitcoin-system>static</Linkage-libbitcoin-system>
     <Linkage-libbitcoin-database>static</Linkage-libbitcoin-database>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Option-ultrafast)' == 'true' And '$(Option-cuda)' == 'true'">
+    <Linkage-ultrafast>cuda</Linkage-ultrafast>
+  </PropertyGroup>
 
   <!-- Messages -->
 
diff --git a/builds/msvc/vs2026/libbitcoin-database/libbitcoin-database.props b/builds/msvc/vs2026/libbitcoin-database/libbitcoin-database.props
index 411f4de3d..a546a5581 100644
--- a/builds/msvc/vs2026/libbitcoin-database/libbitcoin-database.props
+++ b/builds/msvc/vs2026/libbitcoin-database/libbitcoin-database.props
@@ -30,17 +30,23 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-secp256k1>dynamic</Linkage-secp256k1>
+    <Linkage-secp256k1 Condition="'$(Option-secp256k1)' != 'false'">dynamic</Linkage-secp256k1>
+    <Linkage-ultrafast Condition="'$(Option-ultrafast)' == 'true'">dynamic</Linkage-ultrafast>
     <Linkage-libbitcoin-system>dynamic</Linkage-libbitcoin-system>
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-secp256k1>ltcg</Linkage-secp256k1>
+    <Linkage-secp256k1 Condition="'$(Option-secp256k1)' != 'false'">ltcg</Linkage-secp256k1>
+    <Linkage-ultrafast Condition="'$(Option-ultrafast)' == 'true'">ltcg</Linkage-ultrafast>
     <Linkage-libbitcoin-system>ltcg</Linkage-libbitcoin-system>
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-secp256k1>static</Linkage-secp256k1>
+    <Linkage-secp256k1 Condition="'$(Option-secp256k1)' != 'false'">static</Linkage-secp256k1>
+    <Linkage-ultrafast Condition="'$(Option-ultrafast)' == 'true'">static</Linkage-ultrafast>
     <Linkage-libbitcoin-system>static</Linkage-libbitcoin-system>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Option-ultrafast)' == 'true' And '$(Option-cuda)' == 'true'">
+    <Linkage-ultrafast>cuda</Linkage-ultrafast>
+  </PropertyGroup>
 
   <!-- Messages -->
 
diff --git a/builds/msvc/vs2026/libbitcoin-system.import.props b/builds/msvc/vs2026/libbitcoin-system.import.props
index bbf13a736..f5166a0a5 100644
--- a/builds/msvc/vs2026/libbitcoin-system.import.props
+++ b/builds/msvc/vs2026/libbitcoin-system.import.props
@@ -21,6 +21,9 @@
     <!--<Option-256>true</Option-256>-->
     <!--<Option-128>true</Option-128>-->
     <Option-sha Condition="'$(Option-sha)' == ''">false</Option-sha>
+    <Option-secp256k1 Condition="'$(Option-secp256k1)' == ''">true</Option-secp256k1>
+    <Option-ultrafast Condition="'$(Option-ultrafast)' == ''">false</Option-ultrafast>
+    <Option-cuda Condition="'$(Option-cuda)' == ''">false</Option-cuda>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -36,6 +39,9 @@
 
   <Target Name="SystemOptionInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Option-sha        : $(Option-sha)" Importance="high"/>
+    <Message Text="Option-secp256k1  : $(Option-secp256k1)" Importance="high"/>
+    <Message Text="Option-ultrafast  : $(Option-ultrafast)" Importance="high"/>
+    <Message Text="Option-cuda       : $(Option-cuda)" Importance="high"/>
     <!--<Message Text="Option-512        : $(Option-512)" Importance="high"/>-->
     <!--<Message Text="Option-256        : $(Option-256)" Importance="high"/>-->
     <!--<Message Text="Option-128        : $(Option-128)" Importance="high"/>-->