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
5 changes: 5 additions & 0 deletions generate4.xml
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,9 @@
<option type="enable" name="ndebug" default="yes" define="NDEBUG" description="Compile without debug assertions." />
<option type="enable" name="shared" default="yes" define="BOOST_ALL_DYN_LINK" inherited="true" description="Required for dynamically linking boost test." />

<!-- WOLFSSL_USER_SETTINGS enables import of "user_settings.h" into wolfssl without source modification. -->
<define name="WOLFSSL_USER_SETTINGS"/>

<dependency name="boost" version="1.86.0" />
<dependency name="boost_unit_test_framework" option="tests" />
<dependency name="bitcoin-system" version="4.0.0" />
Expand Down Expand Up @@ -390,6 +393,7 @@
<product prefix="lib" path="src" uuid="564eb540-d6b6-425c-b8db-b0bee8970c18" >
<library name="bitcoin-system" />
<headers path="include" />
<headers path="include/bitcoin/ssl" />
<sources path="src" />
</product>
<product prefix="bin" path="test" target_name="libbitcoin-network-test" test="true" option="tests" uuid="d28fc18a-8b81-4247-92ee-6967feefeeff" >
Expand All @@ -400,6 +404,7 @@
<library name="bitcoin-network" />
<library name="boost_unit_test_framework" />
<headers path="include" />
<headers path="include/bitcoin/ssl" />
<sources path="test" />
</product>
<product prefix="include" container="bitcoin" >
Expand Down
4 changes: 4 additions & 0 deletions props/version4/import/libbitcoin-network.import.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,13 @@

<ItemDefinitionGroup>
<ClCompile>
<!-- include\bitcoin\ssl\ is a directory clone of a subset of wolfssl sources, plus config. -->
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-network\include\bitcoin\ssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-network\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
<PreprocessorDefinitions Condition="'$(Linkage-libbitcoin-network)' == 'static' Or '$(Linkage-libbitcoin-network)' == 'ltcg'">BCT_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<!-- WOLFSSL_USER_SETTINGS enables import of "user_settings.h" into wolfssl without source modification. -->
<PreprocessorDefinitions>WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies Condition="'$(Linkage-libbitcoin-network)' != ''">libbitcoin-network.lib;%(AdditionalDependencies)</AdditionalDependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@

<ItemDefinitionGroup>
<ClCompile>
<!-- include\bitcoin\ssl\ is a directory clone of a subset of wolfssl sources, plus config. -->
<AdditionalIncludeDirectories>$(RepoRoot)include\bitcoin\ssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(RepoRoot)include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
<EnablePREfast>false</EnablePREfast>
<PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">BCT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">BCT_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<!-- WOLFSSL_USER_SETTINGS enables import of "user_settings.h" into wolfssl without source modification. -->
<PreprocessorDefinitions>WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>

Expand Down
Loading