aboutsummaryrefslogtreecommitdiff
path: root/build_msvc/test_bitcoin-qt
diff options
context:
space:
mode:
authorAaron Clauson <aaron@sipsorcery.com>2020-01-09 09:19:36 +0000
committerAaron Clauson <aaron@sipsorcery.com>2020-01-09 09:19:36 +0000
commit0874a109da5463699199cf732b974635b97643dd (patch)
tree69a928858daf5b2302a55e814115bd69ac06609f /build_msvc/test_bitcoin-qt
parent6196e930018181301b5972842ae384ea4288ff34 (diff)
Ignore msvc linker warning and update to msvc build instructions.
- Update Visual Studio instructions. - Remove x64 platform conditional from bitcoin-qt project configuration. - Set use native environment toolset to fix linker warning. - Ignore linker warning about precompiled type information missing for test_bitcoin_qt.
Diffstat (limited to 'build_msvc/test_bitcoin-qt')
-rw-r--r--build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj6
1 files changed, 4 insertions, 2 deletions
diff --git a/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj b/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj
index 0979eee8dd..2095c0c321 100644
--- a/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj
+++ b/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj
@@ -67,21 +67,23 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
<ClCompile>
<AdditionalIncludeDirectories>..\libbitcoin_qt\$(GeneratedFilesOutDir)\..\;$(QtIncludeDir)\QtTest;$(QtIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>$(QtLibraryDir)\Qt5Test.lib;$(QtReleaseLibraries);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalOptions>/ignore:4206</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
<ClCompile>
<AdditionalIncludeDirectories>..\libbitcoin_qt\$(GeneratedFilesOutDir)\..\;$(QtIncludeDir)\QtTest;$(QtIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>$(QtDebugLibraries);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalOptions>/ignore:4206</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemGroup>