Skip to content

Commit 04eb87f

Browse files
committed
Update network wolfssl props.
1 parent cb6a87b commit 04eb87f

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

generate4.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -349,8 +349,6 @@
349349

350350
<!-- WOLFSSL_USER_SETTINGS causes import of "user_settings.h". -->
351351
<define name="WOLFSSL_USER_SETTINGS"/>
352-
<!-- NO_MAIN_DRIVER and NO_TESTSUITE_MAIN_DRIVER exclude test mains. -->
353-
<PreprocessorDefinitions>NO_MAIN_DRIVER;NO_TESTSUITE_MAIN_DRIVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
354352

355353
<dependency name="boost" version="1.86.0" />
356354
<dependency name="boost_unit_test_framework" option="tests" />
@@ -397,7 +395,6 @@
397395
<headers path="include" />
398396
<headers path="include/bitcoin/ssl" />
399397
<sources path="src" />
400-
<sources path="src/ssl/wolfssl" />
401398
</product>
402399
<product prefix="bin" path="test" target_name="libbitcoin-network-test" test="true" option="tests" uuid="d28fc18a-8b81-4247-92ee-6967feefeeff" >
403400
<runner>
@@ -408,8 +405,7 @@
408405
<library name="boost_unit_test_framework" />
409406
<headers path="include" />
410407
<headers path="include/bitcoin/ssl" />
411-
<sources path="src/ssl/wolfssl" />
412-
<headers path="test/ssl" />
408+
<headers path="test/ssl/wolfssl" />
413409
<sources path="test" />
414410
</product>
415411
<product prefix="include" container="bitcoin" >

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@
1111

1212
<ItemDefinitionGroup>
1313
<ClCompile>
14-
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-network\test\ssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
15-
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-network\src\ssl\wolfssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
14+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-network\test\ssl\wolfssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1615
<EnablePREfast>false</EnablePREfast>
17-
<PreprocessorDefinitions>NO_MAIN_DRIVER;NO_TESTSUITE_MAIN_DRIVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
16+
<PreprocessorDefinitions>CERT_PREFIX=&quot;$(RepoRoot.Replace("\", "/"))test/ssl/vectors/&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1817
</ClCompile>
1918
<PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
2019
<Command>"$(TargetPath)" --log_level=warning --run_test=* --show_progress=no --build_info=yes</Command>
@@ -24,7 +23,7 @@
2423
<Target Name="SuppressWarningsForWolfSSLFiles" BeforeTargets="ClCompile">
2524
<ItemGroup>
2625
<ClCompile Update="@(ClCompile)">
27-
<AdditionalOptions Condition="$([System.String]::new('%(RelativeDir)').StartsWith('..\..\..\..\test\ssl\'))">/wd4005 /wd4189 /wd4245 /wd4267 /wd4701 /wd4702 /wd4703 %(AdditionalOptions)</AdditionalOptions>
26+
<AdditionalOptions Condition="$([System.String]::new('%(RelativeDir)').StartsWith('..\..\..\..\test\ssl\wolfssl\'))">/wd4005 /wd4189 /wd4245 /wd4267 /wd4701 /wd4702 /wd4703 %(AdditionalOptions)</AdditionalOptions>
2827
</ClCompile>
2928
</ItemGroup>
3029
</Target>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<ClCompile>
1414
<AdditionalIncludeDirectories>$(RepoRoot)include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1515
<AdditionalIncludeDirectories>$(RepoRoot)include\bitcoin\ssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
16-
<AdditionalIncludeDirectories>$(RepoRoot)src\ssl\wolfssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1716
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
1817
<EnablePREfast>false</EnablePREfast>
1918
<PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">BCT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

0 commit comments

Comments
 (0)