Update VS props.

libbitcoin · Nov 24, 2022 · e737149 · e737149
1 parent 0754357
commit e737149
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 22 deletions.
diff --git a/builds/msvc/properties/Common.props b/builds/msvc/properties/Common.props
@@ -1,18 +1,21 @@
 <?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>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <PreprocessorDefinitions>UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <!-- General -->
@@ -23,7 +26,8 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <!-- Language -->
-      <!-- Language extensions are enabled by default (required for STL/Boost). -->
+      <!-- /Zc is conformance mode. -->
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <OpenMPSupport>false</OpenMPSupport>
@@ -38,6 +42,7 @@
 
       <!-- 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>

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/DebugDEXE.props b/builds/msvc/properties/DebugDEXE.props
@@ -14,7 +14,6 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <LinkIncremental>true</LinkIncremental>
     </ClCompile>
   </ItemDefinitionGroup>
 

diff --git a/builds/msvc/properties/DebugDLL.props b/builds/msvc/properties/DebugDLL.props
@@ -13,7 +13,6 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <LinkIncremental>true</LinkIncremental>
     </ClCompile>
   </ItemDefinitionGroup>
 

diff --git a/builds/msvc/properties/DebugLIB.props b/builds/msvc/properties/DebugLIB.props
@@ -12,9 +12,7 @@
 
   <ItemDefinitionGroup>
     <ClCompile>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LinkIncremental>true</LinkIncremental>
     </ClCompile>
   </ItemDefinitionGroup>
 

diff --git a/builds/msvc/properties/DebugLTCG.props b/builds/msvc/properties/DebugLTCG.props
@@ -12,7 +12,6 @@
 
   <ItemDefinitionGroup>
     <ClCompile>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
   </ItemDefinitionGroup>

diff --git a/builds/msvc/properties/DebugSEXE.props b/builds/msvc/properties/DebugSEXE.props
@@ -14,7 +14,6 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LinkIncremental>true</LinkIncremental>
     </ClCompile>
   </ItemDefinitionGroup>
 

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>