Skip to content

Commit e4c46e7

Browse files
evoskuilevoskuil
committed
Merge pull request #54 from evoskuil/master
Prepare for linkage by VC12 (VS2013 RTM) projects.
2 parents c60ac6f + 4751fad commit e4c46e7

File tree

3 files changed

+41
-19
lines changed

3 files changed

+41
-19
lines changed

‎builds/msvc/vs2013/libbitcoin-blockchain.import.props‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,32 @@
2121
</ClCompile>
2222
<Link>
2323
<AdditionalDependencies Condition="'$(Linkage-libbitcoin-blockchain)' != ''">libbitcoin-blockchain.lib;%(AdditionalDependencies)</AdditionalDependencies>
24-
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libbitcoin-blockchain)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
25-
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libbitcoin-blockchain)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
26-
</Link>
24+
<!-- $(PlatformToolset) is hard wired to CTP_Nov2013 to allow for linkage by PlatformToolset=v120 (and CTP_Nov2013) callers. -->
25+
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Debug\CTP_Nov2013\$(Linkage-libbitcoin-blockchain)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
26+
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Release\CTP_Nov2013\$(Linkage-libbitcoin-blockchain)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
27+
</Link>
28+
<Link Condition="$(PlatformToolset) != 'CTP_Nov2013'">
29+
<!-- Need to link $(VC_CTP_Nov2013_LibraryPath_x86), $(VC_CTP_Nov2013_LibraryPath_x64), or $(VC_CTP_Nov2013_LibraryPath_ARM).-->
30+
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'ARM'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib\arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
31+
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'x64'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib\amd64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
32+
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'Win32'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
33+
</Link>
2734
</ItemDefinitionGroup>
2835

2936
<!-- Copy -->
3037

38+
<!-- $(PlatformToolset) is hard wired to CTP_Nov2013 to allow for linkage by PlatformToolset=v120 (and CTP_Nov2013) callers. -->
3139
<Target Name="Linkage-libbitcoin-blockchain-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libbitcoin-blockchain)' == 'dynamic'">
3240
<Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
33-
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libbitcoin-blockchain.dll"
41+
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Debug\CTP_Nov2013\dynamic\libbitcoin-blockchain.dll"
3442
DestinationFiles="$(TargetDir)libbitcoin-blockchain.dll"
3543
SkipUnchangedFiles="true" />
3644
<Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
37-
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libbitcoin-blockchain.pdb"
45+
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Debug\CTP_Nov2013\dynamic\libbitcoin-blockchain.pdb"
3846
DestinationFiles="$(TargetDir)libbitcoin-blockchain.pdb"
3947
SkipUnchangedFiles="true" />
4048
<Copy Condition="$(Configuration.IndexOf('Release')) != -1"
41-
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libbitcoin-blockchain.dll"
49+
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Release\CTP_Nov2013\dynamic\libbitcoin-blockchain.dll"
4250
DestinationFiles="$(TargetDir)libbitcoin-blockchain.dll"
4351
SkipUnchangedFiles="true" />
4452
</Target>

‎builds/msvc/vs2013/libbitcoin-node.import.props‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,36 @@
1616
<ItemDefinitionGroup>
1717
<ClCompile>
1818
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-node\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
19-
<PreprocessorDefinitions Condition="$(Configuration.IndexOf('Release')) != -1">BITCOIN_DISABLE_ASSERTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
2019
<PreprocessorDefinitions Condition="'$(Linkage-libbitcoin-node)' == 'static' Or '$(Linkage-libbitcoin-node)' == 'ltcg'">BCN_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
2120
</ClCompile>
2221
<Link>
2322
<AdditionalDependencies Condition="'$(Linkage-libbitcoin-node)' != ''">libbitcoin-node.lib;%(AdditionalDependencies)</AdditionalDependencies>
24-
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libbitcoin-node\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libbitcoin-node)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
25-
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libbitcoin-node\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libbitcoin-node)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
26-
</Link>
23+
<!-- $(PlatformToolset) is hard wired to CTP_Nov2013 to allow for linkage by PlatformToolset=v120 (and CTP_Nov2013) callers. -->
24+
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libbitcoin-node\bin\$(PlatformName)\Debug\CTP_Nov2013\$(Linkage-libbitcoin-node)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
25+
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libbitcoin-node\bin\$(PlatformName)\Release\CTP_Nov2013\$(Linkage-libbitcoin-node)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
26+
</Link>
27+
<Link Condition="$(PlatformToolset) != 'CTP_Nov2013'">
28+
<!-- Need to link $(VC_CTP_Nov2013_LibraryPath_x86), $(VC_CTP_Nov2013_LibraryPath_x64), or $(VC_CTP_Nov2013_LibraryPath_ARM).-->
29+
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'ARM'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib\arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
30+
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'x64'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib\amd64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
31+
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'Win32'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
32+
</Link>
2733
</ItemDefinitionGroup>
2834

2935
<!-- Copy -->
3036

37+
<!-- $(PlatformToolset) is hard wired to CTP_Nov2013 to allow for linkage by PlatformToolset=v120 (and CTP_Nov2013) callers. -->
3138
<Target Name="Linkage-libbitcoin-node-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libbitcoin-node)' == 'dynamic'">
3239
<Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
33-
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-node\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libbitcoin-node.dll"
40+
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-node\bin\$(PlatformName)\Debug\CTP_Nov2013\dynamic\libbitcoin-node.dll"
3441
DestinationFiles="$(TargetDir)libbitcoin-node.dll"
3542
SkipUnchangedFiles="true" />
3643
<Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
37-
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-node\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libbitcoin-node.pdb"
44+
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-node\bin\$(PlatformName)\Debug\CTP_Nov2013\dynamic\libbitcoin-node.pdb"
3845
DestinationFiles="$(TargetDir)libbitcoin-node.pdb"
3946
SkipUnchangedFiles="true" />
4047
<Copy Condition="$(Configuration.IndexOf('Release')) != -1"
41-
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-node\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libbitcoin-node.dll"
48+
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-node\bin\$(PlatformName)\Release\CTP_Nov2013\dynamic\libbitcoin-node.dll"
4249
DestinationFiles="$(TargetDir)libbitcoin-node.dll"
4350
SkipUnchangedFiles="true" />
4451
</Target>

‎builds/msvc/vs2013/libbitcoin.import.props‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,29 +21,36 @@
2121
<!-- NOMINMAX enables use of std::min/max without conflict. -->
2222
<PreprocessorDefinitions>NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
2323
<PreprocessorDefinitions Condition="'$(Option-testnet)' == 'true'">ENABLE_TESTNET;%(PreprocessorDefinitions)</PreprocessorDefinitions>
24-
<PreprocessorDefinitions Condition="$(Configuration.IndexOf('Release')) != -1">BITCOIN_DISABLE_ASSERTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
2524
<PreprocessorDefinitions Condition="'$(Linkage-libbitcoin)' == 'static' Or '$(Linkage-libbitcoin)' == 'ltcg'">BC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
2625
</ClCompile>
2726
<Link>
2827
<AdditionalDependencies Condition="'$(Linkage-libbitcoin)' != ''">libbitcoin.lib;%(AdditionalDependencies)</AdditionalDependencies>
29-
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libbitcoin\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libbitcoin)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
30-
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libbitcoin\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libbitcoin)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
28+
<!-- $(PlatformToolset) is hard wired to CTP_Nov2013 to allow for linkage by PlatformToolset=v120 (and CTP_Nov2013) callers. -->
29+
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libbitcoin\bin\$(PlatformName)\Debug\CTP_Nov2013\$(Linkage-libbitcoin)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
30+
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libbitcoin\bin\$(PlatformName)\Release\CTP_Nov2013\$(Linkage-libbitcoin)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
31+
</Link>
32+
<Link Condition="$(PlatformToolset) != 'CTP_Nov2013'">
33+
<!-- Need to link $(VC_CTP_Nov2013_LibraryPath_x86), $(VC_CTP_Nov2013_LibraryPath_x64), or $(VC_CTP_Nov2013_LibraryPath_ARM).-->
34+
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'ARM'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib\arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
35+
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'x64'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib\amd64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
36+
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'Win32'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
3137
</Link>
3238
</ItemDefinitionGroup>
3339

3440
<!-- Copy -->
3541

42+
<!-- $(PlatformToolset) is hard wired to CTP_Nov2013 to allow for linkage by PlatformToolset=v120 (and CTP_Nov2013) callers. -->
3643
<Target Name="Linkage-libbitcoin-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libbitcoin)' == 'dynamic'">
3744
<Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
38-
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libbitcoin.dll"
45+
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin\bin\$(PlatformName)\Debug\CTP_Nov2013\dynamic\libbitcoin.dll"
3946
DestinationFiles="$(TargetDir)libbitcoin.dll"
4047
SkipUnchangedFiles="true" />
4148
<Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
42-
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libbitcoin.pdb"
49+
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin\bin\$(PlatformName)\Debug\CTP_Nov2013\dynamic\libbitcoin.pdb"
4350
DestinationFiles="$(TargetDir)libbitcoin.pdb"
4451
SkipUnchangedFiles="true" />
4552
<Copy Condition="$(Configuration.IndexOf('Release')) != -1"
46-
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libbitcoin.dll"
53+
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin\bin\$(PlatformName)\Release\CTP_Nov2013\dynamic\libbitcoin.dll"
4754
DestinationFiles="$(TargetDir)libbitcoin.dll"
4855
SkipUnchangedFiles="true" />
4956
</Target>

0 commit comments

Comments
 (0)