summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevoskuil <eric@voskuil.org>2014-11-09 20:12:15 (GMT)
committer evoskuil <eric@voskuil.org>2014-11-09 20:12:15 (GMT)
commitef52a3d654b9cc81a4331a1b0be0cc4b86bcca87 (patch)
treea516b5d5f2b4acd04a7d7847fb7241ab7a8da1a6
parentffaf8085c2c56b47938af048fd2f9ffad5ea6d57 (diff)
Change VC _SCL_SECURE_NO_WARNINGS to /wd4996 to prevent boost conflict.archive
-rw-r--r--builds/msvc/vs2013/libbitcoin.import.props2
1 files changed, 2 insertions, 0 deletions
diff --git a/builds/msvc/vs2013/libbitcoin.import.props b/builds/msvc/vs2013/libbitcoin.import.props
index 63330e6..b544f60 100644
--- a/builds/msvc/vs2013/libbitcoin.import.props
+++ b/builds/msvc/vs2013/libbitcoin.import.props
@@ -16,6 +16,8 @@
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <!-- can't define _SCL_SECURE_NO_WARNINGS when using boost, can produce redefined symbol error, use 4996 instead -->
+ <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<PreprocessorDefinitions Condition="'$(Option-testnet)' == 'true'">ENABLE_TESTNET;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="$(Configuration.IndexOf('Release')) != -1">BITCOIN_DISABLE_ASSERTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Linkage-libbitcoin)' == 'static' Or '$(Linkage-libbitcoin)' == 'ltcg'">BC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>