Skip to content

Commit c69fae5

Browse files
pmienkpmienk
authored
Merge pull request #445 from pmienk/version3
Regenerate with updated props, vcxproj.
2 parents d0b59c0 + b7fa984 commit c69fae5

File tree

7 files changed

+60
-27
lines changed

7 files changed

+60
-27
lines changed

‎builds/msvc/properties/Common.props‎

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,50 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
3+
44
<PropertyGroup>
55
<_PropertySheetDisplayName>Common Settings</_PropertySheetDisplayName>
66
<CharacterSet>Unicode</CharacterSet>
77
</PropertyGroup>
88

99
<ImportGroup Label="PropertySheets">
1010
<Import Project="$(Platform).props" />
11-
</ImportGroup>
11+
</ImportGroup>
12+
13+
<PropertyGroup Label="Configuration">
14+
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
15+
</PropertyGroup>
1216

1317
<ItemDefinitionGroup>
1418
<ClCompile>
15-
<MultiProcessorCompilation>true</MultiProcessorCompilation>
1619
<PreprocessorDefinitions>UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
17-
<WarningLevel>Level3</WarningLevel>
18-
</ClCompile>
20+
21+
<!-- General -->
22+
<!-- WarningLevel:EnableAllWarnings produce warning flood (mostly from STL/Boost). -->
23+
<WarningLevel>Level4</WarningLevel>
24+
<CompileAsManaged>false</CompileAsManaged>
25+
<CompileAsWinRT>false</CompileAsWinRT>
26+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
27+
28+
<!-- Language -->
29+
<!-- /Zc is conformance mode. -->
30+
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
31+
<EnforceTypeConversionRules>true</EnforceTypeConversionRules>
32+
<RuntimeTypeInfo>true</RuntimeTypeInfo>
33+
<OpenMPSupport>false</OpenMPSupport>
34+
<EnableModules>false</EnableModules>
35+
<LanguageStandard_C>stdc11</LanguageStandard_C>
36+
<LanguageStandard Condition="'$(PlatformToolset)' == 'v141'">stdcpp14</LanguageStandard>
37+
<LanguageStandard Condition="'$(PlatformToolset)' == 'v142'">stdcpp17</LanguageStandard>
38+
<LanguageStandard Condition="'$(PlatformToolset)' == 'v143'">stdcpp20</LanguageStandard>
39+
<ConformanceMode Condition="'$(PlatformToolset)' == 'v141'">false</ConformanceMode>
40+
<ConformanceMode Condition="'$(PlatformToolset)' == 'v142'">true</ConformanceMode>
41+
<ConformanceMode Condition="'$(PlatformToolset)' == 'v143'">true</ConformanceMode>
42+
43+
<!-- External Includes -->
44+
<!-- ExternalWarningLevel:EnableAllWarnings produce warning flood (mostly from STL/Boost). -->
45+
<!-- Language extensions are enabled by default (required for STL/Boost). -->
46+
<ExternalWarningLevel>Level4</ExternalWarningLevel>
47+
</ClCompile>
1948
</ItemDefinitionGroup>
2049

2150
</Project>

‎builds/msvc/properties/Debug.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
<ItemDefinitionGroup>
1414
<ClCompile>
15+
<!-- This is 'both' in VS opions, incompatible with Optimization::MaxSpeed. -->
1516
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
1617
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
1718
<FunctionLevelLinking>true</FunctionLevelLinking>

‎builds/msvc/properties/Messages.props‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
</PropertyGroup>
77

88
<Target Name="ConfigInfo" BeforeTargets="PrepareForBuild">
9+
<Message Text="Visual Studio : $(VisualStudioVersion)" Importance="high"/>
10+
<Message Text="PlatformToolset : $(PlatformToolset)" Importance="high"/>
911
<Message Text="ConfigurationType : $(ConfigurationType)" Importance="high"/>
1012
<Message Text="Configuration : $(Configuration)" Importance="high"/>
11-
<Message Text="PlatformToolset : $(PlatformToolset)" Importance="high"/>
13+
<Message Text="Processor : $(ProcessorArchitecture)" Importance="high"/>
1214
<Message Text="TargetPath : $(TargetPath)" Importance="high"/>
1315
</Target>
1416

‎builds/msvc/properties/Release.props‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,41 @@
1111
<LinkIncremental>false</LinkIncremental>
1212
</PropertyGroup>
1313

14+
<!-- DebugInformationFormat and GenerateDebugInformation were formerly disabled. -->
15+
<!-- This is why we were not getting symbols in release builds (update nuget). -->
1416
<ItemDefinitionGroup>
1517
<ClCompile>
16-
<AdditionalOptions>/Oy- %(AdditionalOptions)</AdditionalOptions>
17-
<!--<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>-->
18+
<!-- performance -->
19+
<BufferSecurityCheck>false</BufferSecurityCheck>
20+
<!-- Breaks boost.test. -->
21+
<!--<CallingConvention>FastCall</CallingConvention>-->
22+
<ControlFlowGuard>false</ControlFlowGuard>
23+
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
24+
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
25+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
1826
<FunctionLevelLinking>true</FunctionLevelLinking>
27+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
1928
<IntrinsicFunctions>true</IntrinsicFunctions>
20-
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
21-
<MinimalRebuild>false</MinimalRebuild>
29+
<OmitFramePointers>true</OmitFramePointers>
2230
<Optimization>MaxSpeed</Optimization>
31+
32+
<!-- SSE4/AVX2 (also AVX512) -->
33+
<!--TODO: these should be integrated with the HAVE build options.-->
34+
<!--<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>-->
35+
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
36+
37+
<!-- Other. -->
38+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
39+
<StringPooling>true</StringPooling>
2340
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
2441
</ClCompile>
2542
<ResourceCompile>
2643
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
2744
</ResourceCompile>
2845
<Link>
2946
<EnableCOMDATFolding>true</EnableCOMDATFolding>
30-
<!--<GenerateDebugInformation>true</GenerateDebugInformation>-->
47+
<GenerateDebugInformation>true</GenerateDebugInformation>
3148
<OptimizeReferences>true</OptimizeReferences>
3249
</Link>
3350
</ItemDefinitionGroup>
34-
35-
<ItemDefinitionGroup Condition="'$(Processor)' == 'x86'">
36-
<ClCompile>
37-
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
38-
</ClCompile>
39-
</ItemDefinitionGroup>
40-
4151
</Project>

‎builds/msvc/vs2022/bn/bn.vcxproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@
6363
</ProjectConfiguration>
6464
</ItemGroup>
6565
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
66-
<PropertyGroup>
67-
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
68-
</PropertyGroup>
6966
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
7067
<ImportGroup Label="PropertySheets">
7168
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />

‎builds/msvc/vs2022/libbitcoin-node-test/libbitcoin-node-test.vcxproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@
6363
</ProjectConfiguration>
6464
</ItemGroup>
6565
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
66-
<PropertyGroup>
67-
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
68-
</PropertyGroup>
6966
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
7067
<ImportGroup Label="PropertySheets">
7168
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />

‎builds/msvc/vs2022/libbitcoin-node/libbitcoin-node.vcxproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@
6666
<ConfigurationType Condition="$(Configuration.IndexOf('DLL')) != -1">DynamicLibrary</ConfigurationType>
6767
</PropertyGroup>
6868
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
69-
<PropertyGroup>
70-
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
71-
</PropertyGroup>
7269
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
7370
<ImportGroup Label="PropertySheets">
7471
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />

0 commit comments

Comments
 (0)