Regenerate with props changes, PreferredToolArchitecture=x64.

libbitcoin · Nov 21, 2022 · 87b2b01 · 87b2b01
1 parent 5287017
commit 87b2b01
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 54 deletions.
diff --git a/builds/msvc/vs2022/libbitcoin-client-examples/libbitcoin-client-examples.vcxproj b/builds/msvc/vs2022/libbitcoin-client-examples/libbitcoin-client-examples.vcxproj
@@ -63,6 +63,9 @@
     </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-client-test/libbitcoin-client-test.vcxproj b/builds/msvc/vs2022/libbitcoin-client-test/libbitcoin-client-test.vcxproj
@@ -63,6 +63,9 @@
     </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-client.import.props b/builds/msvc/vs2022/libbitcoin-client.import.props
@@ -21,18 +21,7 @@
     <Link>
       <AdditionalDependencies Condition="'$(Linkage-libbitcoin-client)' != ''">libbitcoin-client.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
-    <Link Condition="($(PlatformToolset) == 'v120') Or ($(PlatformToolset) == 'CTP_Nov2013')">
-      <!-- $(PlatformToolset) is hard wired to CTP_Nov2013 to allow for linkage by PlatformToolset=v120 (and CTP_Nov2013) callers. -->
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">
-        $(ProjectDir)..\..\..\..\..\libbitcoin-client\bin\$(PlatformName)\Debug\CTP_Nov2013\$(Linkage-libbitcoin-client)\;
-        $(ProjectDir)..\..\..\..\..\libbitcoin-client\obj\libbitcoin-client\$(PlatformName)\Debug\CTP_Nov2013\$(Linkage-libbitcoin-client)\;%(AdditionalLibraryDirectories)
-      </AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">
-        $(ProjectDir)..\..\..\..\..\libbitcoin-client\bin\$(PlatformName)\Release\CTP_Nov2013\$(Linkage-libbitcoin-client)\;
-        $(ProjectDir)..\..\..\..\..\libbitcoin-client\obj\libbitcoin-client\$(PlatformName)\Release\CTP_Nov2013\$(Linkage-libbitcoin-client)\;%(AdditionalLibraryDirectories)
-      </AdditionalLibraryDirectories>
-    </Link>
-    <Link Condition="($(PlatformToolset) != 'v120') And ($(PlatformToolset) != 'CTP_Nov2013')">
+    <Link>
       <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">
         $(ProjectDir)..\..\..\..\..\libbitcoin-client\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libbitcoin-client)\;
         $(ProjectDir)..\..\..\..\..\libbitcoin-client\obj\libbitcoin-client\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libbitcoin-client)\;%(AdditionalLibraryDirectories)
@@ -42,11 +31,5 @@
         $(ProjectDir)..\..\..\..\..\libbitcoin-client\obj\libbitcoin-client\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libbitcoin-client)\;%(AdditionalLibraryDirectories)
       </AdditionalLibraryDirectories>
     </Link>
-    <Link Condition="$(PlatformToolset) == 'v120'">
-      <!-- Need to link $(VC_CTP_Nov2013_LibraryPath_x86), $(VC_CTP_Nov2013_LibraryPath_x64), or $(VC_CTP_Nov2013_LibraryPath_ARM).-->
-      <AdditionalLibraryDirectories Condition="$(PlatformName) == 'ARM'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib\arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(PlatformName) == 'x64'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib\amd64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(PlatformName) == 'Win32'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
   </ItemDefinitionGroup>
 </Project>
diff --git a/builds/msvc/vs2022/libbitcoin-client/libbitcoin-client.vcxproj b/builds/msvc/vs2022/libbitcoin-client/libbitcoin-client.vcxproj
@@ -66,6 +66,9 @@
     <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" />

diff --git a/builds/msvc/vs2022/libbitcoin-protocol.import.props b/builds/msvc/vs2022/libbitcoin-protocol.import.props
@@ -22,18 +22,7 @@
       <AdditionalDependencies Condition="'$(Linkage-libbitcoin-protocol)' != ''">libbitcoin-protocol.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalDependencies>Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
-    <Link Condition="($(PlatformToolset) == 'v120') Or ($(PlatformToolset) == 'CTP_Nov2013')">
-      <!-- $(PlatformToolset) is hard wired to CTP_Nov2013 to allow for linkage by PlatformToolset=v120 (and CTP_Nov2013) callers. -->
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">
-        $(ProjectDir)..\..\..\..\..\libbitcoin-protocol\bin\$(PlatformName)\Debug\CTP_Nov2013\$(Linkage-libbitcoin-protocol)\;
-        $(ProjectDir)..\..\..\..\..\libbitcoin-protocol\obj\libbitcoin-protocol\$(PlatformName)\Debug\CTP_Nov2013\$(Linkage-libbitcoin-protocol)\;%(AdditionalLibraryDirectories)
-      </AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">
-        $(ProjectDir)..\..\..\..\..\libbitcoin-protocol\bin\$(PlatformName)\Release\CTP_Nov2013\$(Linkage-libbitcoin-protocol)\;
-        $(ProjectDir)..\..\..\..\..\libbitcoin-protocol\obj\libbitcoin-protocol\$(PlatformName)\Release\CTP_Nov2013\$(Linkage-libbitcoin-protocol)\;%(AdditionalLibraryDirectories)
-      </AdditionalLibraryDirectories>
-    </Link>
-    <Link Condition="($(PlatformToolset) != 'v120') And ($(PlatformToolset) != 'CTP_Nov2013')">
+    <Link>
       <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">
         $(ProjectDir)..\..\..\..\..\libbitcoin-protocol\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libbitcoin-protocol)\;
         $(ProjectDir)..\..\..\..\..\libbitcoin-protocol\obj\libbitcoin-protocol\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libbitcoin-protocol)\;%(AdditionalLibraryDirectories)
@@ -43,11 +32,5 @@
         $(ProjectDir)..\..\..\..\..\libbitcoin-protocol\obj\libbitcoin-protocol\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libbitcoin-protocol)\;%(AdditionalLibraryDirectories)
       </AdditionalLibraryDirectories>
     </Link>
-    <Link Condition="$(PlatformToolset) == 'v120'">
-      <!-- Need to link $(VC_CTP_Nov2013_LibraryPath_x86), $(VC_CTP_Nov2013_LibraryPath_x64), or $(VC_CTP_Nov2013_LibraryPath_ARM).-->
-      <AdditionalLibraryDirectories Condition="$(PlatformName) == 'ARM'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib\arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(PlatformName) == 'x64'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib\amd64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(PlatformName) == 'Win32'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
   </ItemDefinitionGroup>
 </Project>
diff --git a/builds/msvc/vs2022/libbitcoin-system.import.props b/builds/msvc/vs2022/libbitcoin-system.import.props
@@ -26,18 +26,7 @@
     <Link>
       <AdditionalDependencies Condition="'$(Linkage-libbitcoin-system)' != ''">libbitcoin-system.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
-    <Link Condition="($(PlatformToolset) == 'v120') Or ($(PlatformToolset) == 'CTP_Nov2013')">
-      <!-- $(PlatformToolset) is hard wired to CTP_Nov2013 to allow for linkage by PlatformToolset=v120 (and CTP_Nov2013) callers. -->
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">
-        $(ProjectDir)..\..\..\..\..\libbitcoin-system\bin\$(PlatformName)\Debug\CTP_Nov2013\$(Linkage-libbitcoin-system)\;
-        $(ProjectDir)..\..\..\..\..\libbitcoin-system\obj\libbitcoin-system\$(PlatformName)\Debug\CTP_Nov2013\$(Linkage-libbitcoin-system)\;%(AdditionalLibraryDirectories)
-      </AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">
-        $(ProjectDir)..\..\..\..\..\libbitcoin-system\bin\$(PlatformName)\Release\CTP_Nov2013\$(Linkage-libbitcoin-system)\;
-        $(ProjectDir)..\..\..\..\..\libbitcoin-system\obj\libbitcoin-system\$(PlatformName)\Release\CTP_Nov2013\$(Linkage-libbitcoin-system)\;%(AdditionalLibraryDirectories)
-      </AdditionalLibraryDirectories>
-    </Link>
-    <Link Condition="($(PlatformToolset) != 'v120') And ($(PlatformToolset) != 'CTP_Nov2013')">
+    <Link>
       <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">
         $(ProjectDir)..\..\..\..\..\libbitcoin-system\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libbitcoin-system)\;
         $(ProjectDir)..\..\..\..\..\libbitcoin-system\obj\libbitcoin-system\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libbitcoin-system)\;%(AdditionalLibraryDirectories)
@@ -47,11 +36,5 @@
         $(ProjectDir)..\..\..\..\..\libbitcoin-system\obj\libbitcoin-system\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libbitcoin-system)\;%(AdditionalLibraryDirectories)
       </AdditionalLibraryDirectories>
     </Link>
-    <Link Condition="$(PlatformToolset) == 'v120'">
-      <!-- Need to link $(VC_CTP_Nov2013_LibraryPath_x86), $(VC_CTP_Nov2013_LibraryPath_x64), or $(VC_CTP_Nov2013_LibraryPath_ARM). -->
-      <AdditionalLibraryDirectories Condition="$(PlatformName) == 'ARM'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib\arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(PlatformName) == 'x64'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib\amd64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(PlatformName) == 'Win32'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
   </ItemDefinitionGroup>
 </Project>