Skip to content

Commit 5349882

Browse files
committed
Update libbitcoin-consensus import props for C++11 requirement.
1 parent 8647d59 commit 5349882

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

builds/msvc/vs2013/libbitcoin-consensus.import.props

+9-7
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,32 @@
1616
<ItemDefinitionGroup Condition="'$(Linkage-libbitcoin-consensus)' != 'none'">
1717
<ClCompile>
1818
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-consensus\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
19+
<!-- can't define _SCL_SECURE_NO_WARNINGS when using boost, can produce redefined symbol error, use 4996 instead -->
20+
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
1921
<PreprocessorDefinitions Condition="'$(Linkage-libbitcoin-consensus)' == 'static' Or '$(Linkage-libbitcoin-consensus)' == 'ltcg'">BCK_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
2022
</ClCompile>
2123
<Link>
22-
<!-- $(PlatformToolset) is hard wired to v120 to allow for linkage by PlatformToolset=CTP_Nov2013 callers. -->
24+
<!-- Because cloned files use C++11 the CTP_Nov2013 compiler is not optional. -->
2325
<AdditionalDependencies Condition="'$(Linkage-libbitcoin-consensus)' != ''">libbitcoin-consensus.lib;%(AdditionalDependencies)</AdditionalDependencies>
24-
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libbitcoin-consensus\bin\$(PlatformName)\Debug\v120\$(Linkage-libbitcoin-consensus)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
25-
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libbitcoin-consensus\bin\$(PlatformName)\Release\v120\$(Linkage-libbitcoin-consensus)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
26+
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libbitcoin-consensus\bin\$(PlatformName)\Debug\CTP_Nov2013\$(Linkage-libbitcoin-consensus)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
27+
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libbitcoin-consensus\bin\$(PlatformName)\Release\CTP_Nov2013\$(Linkage-libbitcoin-consensus)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
2628
</Link>
2729
</ItemDefinitionGroup>
2830

2931
<!-- Copy -->
3032

31-
<!-- $(PlatformToolset) is hard wired to v120 to allow for linkage by PlatformToolset=CTP_Nov2013 callers. -->
33+
<!-- Because cloned files use C++11 the CTP_Nov2013 compiler is not optional. -->
3234
<Target Name="Linkage-libbitcoin-consensus-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libbitcoin-consensus)' == 'dynamic'">
3335
<Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
34-
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-consensus\bin\$(PlatformName)\Debug\v120\dynamic\libbitcoin-consensus.dll"
36+
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-consensus\bin\$(PlatformName)\Debug\CTP_Nov2013\dynamic\libbitcoin-consensus.dll"
3537
DestinationFiles="$(TargetDir)libbitcoin-consensus.dll"
3638
SkipUnchangedFiles="true" />
3739
<Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
38-
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-consensus\bin\$(PlatformName)\Debug\v120\dynamic\libbitcoin-consensus.pdb"
40+
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-consensus\bin\$(PlatformName)\Debug\CTP_Nov2013\dynamic\libbitcoin-consensus.pdb"
3941
DestinationFiles="$(TargetDir)libbitcoin-consensus.pdb"
4042
SkipUnchangedFiles="true" />
4143
<Copy Condition="$(Configuration.IndexOf('Release')) != -1"
42-
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-consensus\bin\$(PlatformName)\Release\v120\dynamic\libbitcoin-consensus.dll"
44+
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-consensus\bin\$(PlatformName)\Release\CTP_Nov2013\dynamic\libbitcoin-consensus.dll"
4345
DestinationFiles="$(TargetDir)libbitcoin-consensus.dll"
4446
SkipUnchangedFiles="true" />
4547
</Target>

0 commit comments

Comments
 (0)