Skip to content

Commit 7747033

Browse files
committed
Embed wolfssl in network.
1 parent 073fc9a commit 7747033

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

generate4.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,9 @@
347347
<option type="enable" name="ndebug" default="yes" define="NDEBUG" description="Compile without debug assertions." />
348348
<option type="enable" name="shared" default="yes" define="BOOST_ALL_DYN_LINK" inherited="true" description="Required for dynamically linking boost test." />
349349

350+
<!-- WOLFSSL_USER_SETTINGS enables import of "user_settings.h" into wolfssl without source modification. -->
351+
<define name="WOLFSSL_USER_SETTINGS"/>
352+
350353
<dependency name="boost" version="1.86.0" />
351354
<dependency name="boost_unit_test_framework" option="tests" />
352355
<dependency name="bitcoin-system" version="4.0.0" />
@@ -390,6 +393,7 @@
390393
<product prefix="lib" path="src" uuid="564eb540-d6b6-425c-b8db-b0bee8970c18" >
391394
<library name="bitcoin-system" />
392395
<headers path="include" />
396+
<headers path="include/bitcoin/network/ssl" />
393397
<sources path="src" />
394398
</product>
395399
<product prefix="bin" path="test" target_name="libbitcoin-network-test" test="true" option="tests" uuid="d28fc18a-8b81-4247-92ee-6967feefeeff" >
@@ -400,6 +404,7 @@
400404
<library name="bitcoin-network" />
401405
<library name="boost_unit_test_framework" />
402406
<headers path="include" />
407+
<headers path="include/bitcoin/network/ssl" />
403408
<sources path="test" />
404409
</product>
405410
<product prefix="include" container="bitcoin" >

props/version4/import/libbitcoin-network.import.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@
1515

1616
<ItemDefinitionGroup>
1717
<ClCompile>
18+
<!-- include\bitcoin\network\ssl\ is a directory clone of a subset of wolfssl sources, plus config. -->
19+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-network\include\bitcoin\network\ssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1820
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-network\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1921
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
2022
<PreprocessorDefinitions Condition="'$(Linkage-libbitcoin-network)' == 'static' Or '$(Linkage-libbitcoin-network)' == 'ltcg'">BCT_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
23+
<!-- WOLFSSL_USER_SETTINGS enables import of "user_settings.h" into wolfssl without source modification. -->
24+
<PreprocessorDefinitions>WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
2125
</ClCompile>
2226
<Link>
2327
<AdditionalDependencies Condition="'$(Linkage-libbitcoin-network)' != ''">libbitcoin-network.lib;%(AdditionalDependencies)</AdditionalDependencies>

props/version4/project/libbitcoin-network/libbitcoin-network/libbitcoin-network.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,15 @@
1111

1212
<ItemDefinitionGroup>
1313
<ClCompile>
14+
<!-- include\bitcoin\network\ssl\ is a directory clone of a subset of wolfssl sources, plus config. -->
15+
<AdditionalIncludeDirectories>$(RepoRoot)include\bitcoin\network\ssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1416
<AdditionalIncludeDirectories>$(RepoRoot)include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1517
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
1618
<EnablePREfast>false</EnablePREfast>
1719
<PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">BCT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1820
<PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">BCT_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
21+
<!-- WOLFSSL_USER_SETTINGS enables import of "user_settings.h" into wolfssl without source modification. -->
22+
<PreprocessorDefinitions>WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1923
</ClCompile>
2024
</ItemDefinitionGroup>
2125

0 commit comments

Comments
 (0)