diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-01-07 14:30:32 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-01-07 14:33:48 +0100 |
| commit | f0fa6bad00f13bd372b5b4bc6bbe3f9afdf66640 (patch) | |
| tree | 86afd1c8bc8ccff01f2b517bb0c7614610b6a69c | |
| parent | 295a1ad5223535d5e685a56246a5a814c04a0e91 (diff) | |
| parent | c98f8866fedc6f223746674cc1ecad1c2afaca17 (diff) | |
| download | bitcoin-f0fa6bad00f13bd372b5b4bc6bbe3f9afdf66640.tar.xz | |
Merge #15110: build_msvc: Fix the build problem in libbitcoin_server
c98f8866fedc6f223746674cc1ecad1c2afaca17 Fix the build problem in libbitcoin_server (Alexey Poghilenkov)
Pull request description:
Fixes https://github.com/bitcoin/bitcoin/issues/15049
The reason of this problem is existance two similar lines in the libbitcoin_server.vcxproj file that appears after the executing the msvc-autogen.py script .
line 157
> <ItemGroup>
<ClCompile Include="..\..\src\rpc\net.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\netrpc.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\netrpc.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\netrpc.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\netrpc.obj</ObjectFileName>
</ClCompile>
line 256
> <ItemGroup>
<ClCompile Include="..\..\src\rpc\net.cpp">
<ObjectFileName>$(IntDir)rpc_net.obj</ObjectFileName>
</ClCompile>
Tree-SHA512: 0f2841a32253c503731c9007fa2a02d330ab4b670c154dcfce6fd0919752317bc3133f074d21e90f73054ab3c0a8a3d222b4fadc34fbcecd3e8af093eea38b49
| -rw-r--r-- | build_msvc/libbitcoin_server/libbitcoin_server.vcxproj.in | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/build_msvc/libbitcoin_server/libbitcoin_server.vcxproj.in b/build_msvc/libbitcoin_server/libbitcoin_server.vcxproj.in index 0a165d0b75..e66277123a 100644 --- a/build_msvc/libbitcoin_server/libbitcoin_server.vcxproj.in +++ b/build_msvc/libbitcoin_server/libbitcoin_server.vcxproj.in @@ -154,12 +154,6 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\src\rpc\net.cpp"> - <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\netrpc.obj</ObjectFileName> - <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\netrpc.obj</ObjectFileName> - <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\netrpc.obj</ObjectFileName> - <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\netrpc.obj</ObjectFileName> - </ClCompile> @SOURCE_FILES@ </ItemGroup> <ItemGroup> |