highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-05-03 08:21:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #15110: build_msvc: Fix the build problem in libbitcoin_server

Browse Source 
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
This commit is contained in:
Wladimir J. van der Laan 2019-01-07 14:30:32 +01:00
commit f0fa6bad00
No known key found for this signature in database
GPG Key ID: 1E4AED62986CD25D
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_msvc/libbitcoin_server/libbitcoin_server.vcxproj.in
View File

@ -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>