Skip to content

Commit 6305be2

Browse files
evoskuilevoskuil
authored
Merge pull request #240 from pmienk/version3
Regenerate with props changes, PreferredToolArchitecture=x64.
2 parents 21c04d2 + 7f31a86 commit 6305be2

4 files changed

Lines changed: 8 additions & 36 deletions

File tree

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

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

‎builds/msvc/vs2022/libbitcoin-protocol.import.props‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,7 @@
2222
<AdditionalDependencies Condition="'$(Linkage-libbitcoin-protocol)' != ''">libbitcoin-protocol.lib;%(AdditionalDependencies)</AdditionalDependencies>
2323
<AdditionalDependencies>Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
2424
</Link>
25-
<Link Condition="($(PlatformToolset) == 'v120') Or ($(PlatformToolset) == 'CTP_Nov2013')">
26-
<!-- $(PlatformToolset) is hard wired to CTP_Nov2013 to allow for linkage by PlatformToolset=v120 (and CTP_Nov2013) callers. -->
27-
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">
28-
$(ProjectDir)..\..\..\..\..\libbitcoin-protocol\bin\$(PlatformName)\Debug\CTP_Nov2013\$(Linkage-libbitcoin-protocol)\;
29-
$(ProjectDir)..\..\..\..\..\libbitcoin-protocol\obj\libbitcoin-protocol\$(PlatformName)\Debug\CTP_Nov2013\$(Linkage-libbitcoin-protocol)\;%(AdditionalLibraryDirectories)
30-
</AdditionalLibraryDirectories>
31-
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">
32-
$(ProjectDir)..\..\..\..\..\libbitcoin-protocol\bin\$(PlatformName)\Release\CTP_Nov2013\$(Linkage-libbitcoin-protocol)\;
33-
$(ProjectDir)..\..\..\..\..\libbitcoin-protocol\obj\libbitcoin-protocol\$(PlatformName)\Release\CTP_Nov2013\$(Linkage-libbitcoin-protocol)\;%(AdditionalLibraryDirectories)
34-
</AdditionalLibraryDirectories>
35-
</Link>
36-
<Link Condition="($(PlatformToolset) != 'v120') And ($(PlatformToolset) != 'CTP_Nov2013')">
25+
<Link>
3726
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">
3827
$(ProjectDir)..\..\..\..\..\libbitcoin-protocol\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libbitcoin-protocol)\;
3928
$(ProjectDir)..\..\..\..\..\libbitcoin-protocol\obj\libbitcoin-protocol\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libbitcoin-protocol)\;%(AdditionalLibraryDirectories)
@@ -43,11 +32,5 @@
4332
$(ProjectDir)..\..\..\..\..\libbitcoin-protocol\obj\libbitcoin-protocol\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libbitcoin-protocol)\;%(AdditionalLibraryDirectories)
4433
</AdditionalLibraryDirectories>
4534
</Link>
46-
<Link Condition="$(PlatformToolset) == 'v120'">
47-
<!-- Need to link $(VC_CTP_Nov2013_LibraryPath_x86), $(VC_CTP_Nov2013_LibraryPath_x64), or $(VC_CTP_Nov2013_LibraryPath_ARM).-->
48-
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'ARM'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib\arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
49-
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'x64'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib\amd64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
50-
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'Win32'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
51-
</Link>
5235
</ItemDefinitionGroup>
5336
</Project>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@
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>
6972
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
7073
<ImportGroup Label="PropertySheets">
7174
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />

‎builds/msvc/vs2022/libbitcoin-system.import.props‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,7 @@
2626
<Link>
2727
<AdditionalDependencies Condition="'$(Linkage-libbitcoin-system)' != ''">libbitcoin-system.lib;%(AdditionalDependencies)</AdditionalDependencies>
2828
</Link>
29-
<Link Condition="($(PlatformToolset) == 'v120') Or ($(PlatformToolset) == 'CTP_Nov2013')">
30-
<!-- $(PlatformToolset) is hard wired to CTP_Nov2013 to allow for linkage by PlatformToolset=v120 (and CTP_Nov2013) callers. -->
31-
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">
32-
$(ProjectDir)..\..\..\..\..\libbitcoin-system\bin\$(PlatformName)\Debug\CTP_Nov2013\$(Linkage-libbitcoin-system)\;
33-
$(ProjectDir)..\..\..\..\..\libbitcoin-system\obj\libbitcoin-system\$(PlatformName)\Debug\CTP_Nov2013\$(Linkage-libbitcoin-system)\;%(AdditionalLibraryDirectories)
34-
</AdditionalLibraryDirectories>
35-
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">
36-
$(ProjectDir)..\..\..\..\..\libbitcoin-system\bin\$(PlatformName)\Release\CTP_Nov2013\$(Linkage-libbitcoin-system)\;
37-
$(ProjectDir)..\..\..\..\..\libbitcoin-system\obj\libbitcoin-system\$(PlatformName)\Release\CTP_Nov2013\$(Linkage-libbitcoin-system)\;%(AdditionalLibraryDirectories)
38-
</AdditionalLibraryDirectories>
39-
</Link>
40-
<Link Condition="($(PlatformToolset) != 'v120') And ($(PlatformToolset) != 'CTP_Nov2013')">
29+
<Link>
4130
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">
4231
$(ProjectDir)..\..\..\..\..\libbitcoin-system\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libbitcoin-system)\;
4332
$(ProjectDir)..\..\..\..\..\libbitcoin-system\obj\libbitcoin-system\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libbitcoin-system)\;%(AdditionalLibraryDirectories)
@@ -47,11 +36,5 @@
4736
$(ProjectDir)..\..\..\..\..\libbitcoin-system\obj\libbitcoin-system\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libbitcoin-system)\;%(AdditionalLibraryDirectories)
4837
</AdditionalLibraryDirectories>
4938
</Link>
50-
<Link Condition="$(PlatformToolset) == 'v120'">
51-
<!-- Need to link $(VC_CTP_Nov2013_LibraryPath_x86), $(VC_CTP_Nov2013_LibraryPath_x64), or $(VC_CTP_Nov2013_LibraryPath_ARM). -->
52-
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'ARM'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib\arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
53-
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'x64'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib\amd64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
54-
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'Win32'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
55-
</Link>
5639
</ItemDefinitionGroup>
5740
</Project>

0 commit comments

Comments
 (0)