Skip to content

Update wolfssl props, comments, delint. #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evoskuil merged 1 commit into from
Jan 16, 2026
Merged

Update wolfssl props, comments, delint. #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 1 deletion generate4.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@
<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. -->
<!-- WOLFSSL_USER_SETTINGS causes import of "user_settings.h". -->
<define name="WOLFSSL_USER_SETTINGS"/>
<!-- NO_MAIN_DRIVER and NO_TESTSUITE_MAIN_DRIVER exclude test mains. -->
<PreprocessorDefinitions>NO_MAIN_DRIVER;NO_TESTSUITE_MAIN_DRIVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand Down Expand Up @@ -397,6 +397,7 @@
<headers path="include" />
<headers path="include/bitcoin/ssl" />
<sources path="src" />
<sources path="src/ssl/wolfssl" />
</product>
<product prefix="bin" path="test" target_name="libbitcoin-network-test" test="true" option="tests" uuid="d28fc18a-8b81-4247-92ee-6967feefeeff" >
<runner>
Expand All @@ -407,6 +408,7 @@
<library name="boost_unit_test_framework" />
<headers path="include" />
<headers path="include/bitcoin/ssl" />
<sources path="src/ssl/wolfssl" />
<headers path="test/ssl" />
<sources path="test" />
</product>
Expand Down
2 changes: 0 additions & 2 deletions props/version4/import/libbitcoin-network.import.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,10 @@

<ItemDefinitionGroup>
<ClCompile>
<!-- include\bitcoin\ssl\ is a directory clone of a subset of wolfssl sources, plus config. -->
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-network\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-network\include\bitcoin\ssl\;%(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>
Expand Down
11 changes: 9 additions & 2 deletions ...version4/project/libbitcoin-network/libbitcoin-network-test/libbitcoin-network-test.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,24 @@

<ItemDefinitionGroup>
<ClCompile>
<!-- test\ssl\ is a directory clone of a subset of wolfssl test sources. -->
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-network\test\ssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-network\src\ssl\wolfssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<EnablePREfast>false</EnablePREfast>
<!-- NO_MAIN_DRIVER enables use of boost test for wolfssl test execution. -->
<PreprocessorDefinitions>NO_MAIN_DRIVER;NO_TESTSUITE_MAIN_DRIVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
<Command>"$(TargetPath)" --log_level=warning --run_test=* --show_progress=no --build_info=yes</Command>
</PostBuildEvent>
</ItemDefinitionGroup>

<Target Name="SuppressWarningsForWolfSSLFiles" BeforeTargets="ClCompile">
<ItemGroup>
<ClCompile Update="@(ClCompile)">
<AdditionalOptions Condition="$([System.String]::new('%(RelativeDir)').StartsWith('..\..\..\..\test\ssl\'))">/wd4005 /wd4189 /wd4245 /wd4267 /wd4701 /wd4702 /wd4703 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemGroup>
</Target>

<!-- Dependencies -->

<ImportGroup Label="PropertySheets">
Expand Down
11 changes: 9 additions & 2 deletions props/version4/project/libbitcoin-network/libbitcoin-network/libbitcoin-network.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,25 @@

<ItemDefinitionGroup>
<ClCompile>
<!-- include\bitcoin\ssl\ is a directory clone of a subset of wolfssl sources, plus config. -->
<AdditionalIncludeDirectories>$(RepoRoot)include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(RepoRoot)include\bitcoin\ssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(RepoRoot)src\ssl\wolfssl\;%(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>

<Target Name="SuppressWarningsForWolfSSLFiles" BeforeTargets="ClCompile">
<ItemGroup>
<ClCompile Update="@(ClCompile)">
<AdditionalOptions Condition="$([System.String]::new('%(RelativeDir)').StartsWith('..\..\..\..\src\ssl\'))">/wd4189 /wd4245 /wd4267 /wd4701 /wd4702 /wd4703 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemGroup>
</Target>

<!-- Dependencies -->

<ImportGroup Label="PropertySheets">
Expand Down
Loading