Regenerate with updated props, vcxproj.

libbitcoin · Nov 28, 2022 · d9bdf57 · d9bdf57
1 parent c34593a
commit d9bdf57
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 24 deletions.
diff --git a/builds/msvc/properties/Common.props b/builds/msvc/properties/Common.props
@@ -1,21 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
+
   <PropertyGroup>
     <_PropertySheetDisplayName>Common Settings</_PropertySheetDisplayName>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
 
   <ImportGroup Label="PropertySheets">
     <Import Project="$(Platform).props" />
-  </ImportGroup>  
+  </ImportGroup>
+
+  <PropertyGroup Label="Configuration">
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
+  </PropertyGroup>
 
   <ItemDefinitionGroup>
     <ClCompile>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PreprocessorDefinitions>UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
+
+      <!-- General -->
+      <!-- WarningLevel:EnableAllWarnings produce warning flood (mostly from STL/Boost). -->
+      <WarningLevel>Level4</WarningLevel>
+      <CompileAsManaged>false</CompileAsManaged>
+      <CompileAsWinRT>false</CompileAsWinRT>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+
+      <!-- Language -->
+      <!-- /Zc is conformance mode. -->
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <OpenMPSupport>false</OpenMPSupport>
+      <EnableModules>false</EnableModules>
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
+      <LanguageStandard Condition="'$(PlatformToolset)' == 'v141'">stdcpp14</LanguageStandard>
+      <LanguageStandard Condition="'$(PlatformToolset)' == 'v142'">stdcpp17</LanguageStandard>
+      <LanguageStandard Condition="'$(PlatformToolset)' == 'v143'">stdcpp20</LanguageStandard>
+      <ConformanceMode Condition="'$(PlatformToolset)' == 'v141'">false</ConformanceMode>
+      <ConformanceMode Condition="'$(PlatformToolset)' == 'v142'">true</ConformanceMode>
+      <ConformanceMode Condition="'$(PlatformToolset)' == 'v143'">true</ConformanceMode>
+
+      <!-- External Includes -->
+      <!-- ExternalWarningLevel:EnableAllWarnings produce warning flood (mostly from STL/Boost). -->
+      <!-- Language extensions are enabled by default (required for STL/Boost). -->
+      <ExternalWarningLevel>Level4</ExternalWarningLevel>
+      </ClCompile>
   </ItemDefinitionGroup>
 
 </Project>
diff --git a/builds/msvc/properties/Debug.props b/builds/msvc/properties/Debug.props
@@ -12,6 +12,7 @@
 
   <ItemDefinitionGroup>
     <ClCompile>
+      <!-- This is 'both' in VS opions, incompatible with Optimization::MaxSpeed. -->
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <FunctionLevelLinking>true</FunctionLevelLinking>

diff --git a/builds/msvc/properties/Messages.props b/builds/msvc/properties/Messages.props
@@ -6,9 +6,11 @@
   </PropertyGroup>
 
   <Target Name="ConfigInfo" BeforeTargets="PrepareForBuild">
+    <Message Text="Visual Studio     : $(VisualStudioVersion)" Importance="high"/>
+    <Message Text="PlatformToolset   : $(PlatformToolset)" Importance="high"/>
     <Message Text="ConfigurationType : $(ConfigurationType)" Importance="high"/>
     <Message Text="Configuration     : $(Configuration)" Importance="high"/>
-    <Message Text="PlatformToolset   : $(PlatformToolset)" Importance="high"/>
+    <Message Text="Processor         : $(ProcessorArchitecture)" Importance="high"/>
     <Message Text="TargetPath        : $(TargetPath)" Importance="high"/>
   </Target>
 

diff --git a/builds/msvc/properties/Release.props b/builds/msvc/properties/Release.props
@@ -11,31 +11,41 @@
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
 
+  <!-- DebugInformationFormat and GenerateDebugInformation were formerly disabled. -->
+  <!-- This is why we were not getting symbols in release builds (update nuget). -->
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalOptions>/Oy- %(AdditionalOptions)</AdditionalOptions>
-      <!--<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>-->
+      <!-- performance -->
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <!-- Breaks boost.test. -->
+      <!--<CallingConvention>FastCall</CallingConvention>-->
+      <ControlFlowGuard>false</ControlFlowGuard>
+      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
+      <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <FunctionLevelLinking>true</FunctionLevelLinking>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <MinimalRebuild>false</MinimalRebuild>
+      <OmitFramePointers>true</OmitFramePointers>
       <Optimization>MaxSpeed</Optimization>
+
+      <!-- SSE4/AVX2 (also AVX512) -->
+      <!--TODO: these should be integrated with the HAVE build options.-->
+      <!--<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>-->
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
+
+      <!-- Other. -->
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <StringPooling>true</StringPooling>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <!--<GenerateDebugInformation>true</GenerateDebugInformation>-->
+      <GenerateDebugInformation>true</GenerateDebugInformation>
       <OptimizeReferences>true</OptimizeReferences>
     </Link> 
   </ItemDefinitionGroup>
-
-  <ItemDefinitionGroup Condition="'$(Processor)' == 'x86'">
-    <ClCompile>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
 </Project>
diff --git a/builds/msvc/vs2022/libbitcoin-consensus-test/libbitcoin-consensus-test.vcxproj b/builds/msvc/vs2022/libbitcoin-consensus-test/libbitcoin-consensus-test.vcxproj
@@ -63,9 +63,6 @@
     </ProjectConfiguration>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup>
-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
-  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />

diff --git a/builds/msvc/vs2022/libbitcoin-consensus/libbitcoin-consensus.vcxproj b/builds/msvc/vs2022/libbitcoin-consensus/libbitcoin-consensus.vcxproj
@@ -66,9 +66,6 @@
     <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) != -1">DynamicLibrary</ConfigurationType>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup>
-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
-  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />