ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge ripple_asio into ripple_net

Browse Source
This commit is contained in:
Vinnie Falco
2013-08-31 11:47:55 -07:00
parent a9f6d67bba
commit e7d043e4df
14 changed files with 60 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Builds/QtCreator/rippled.pro
View File

@@ -74,7 +74,6 @@ SOURCES += \
../../modules/ripple_app/ripple_app_pt6.cpp \
../../modules/ripple_app/ripple_app_pt7.cpp \
../../modules/ripple_app/ripple_app_pt8.cpp \
../../modules/ripple_asio/ripple_asio.cpp \
../../modules/ripple_basics/ripple_basics.cpp \
../../modules/ripple_core/ripple_core.cpp \
../../modules/ripple_client/ripple_client.cpp \

27
Builds/VisualStudio2012/RippleD.vcxproj
View File

@@ -671,13 +671,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_asio\ripple_asio.cpp" />
<ClCompile Include="..\..\modules\ripple_asio\sockets\RippleSSLContext.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_basics\containers\ripple_RangeSet.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -973,6 +966,12 @@
<ClCompile Include="..\..\modules\ripple_hyperleveldb\ripple_hyperleveldb.cpp" />
<ClCompile Include="..\..\modules\ripple_leveldb\ripple_leveldb.cpp" />
<ClCompile Include="..\..\modules\ripple_mdb\ripple_mdb.c" />
<ClCompile Include="..\..\modules\ripple_net\basics\RippleSSLContext.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_net\basics\ripple_HTTPRequest.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -985,6 +984,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_net\basics\ripple_MultiSocket.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_net\basics\ripple_RPCServer.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1465,11 +1470,6 @@
<ClInclude Include="..\..\modules\ripple_app\websocket\WSConnection.h" />
<ClInclude Include="..\..\modules\ripple_app\websocket\WSDoor.h" />
<ClInclude Include="..\..\modules\ripple_app\websocket\WSServerHandler.h" />
<ClInclude Include="..\..\modules\ripple_asio\ripple_asio.h" />
<ClInclude Include="..\..\modules\ripple_asio\sockets\ripple_MultiSocket.cpp" />
<ClInclude Include="..\..\modules\ripple_asio\sockets\ripple_MultiSocket.h" />
<ClInclude Include="..\..\modules\ripple_asio\sockets\ripple_MultiSocketType.h" />
<ClInclude Include="..\..\modules\ripple_asio\sockets\RippleSSLContext.h" />
<ClInclude Include="..\..\modules\ripple_basics\containers\ripple_KeyCache.h" />
<ClInclude Include="..\..\modules\ripple_basics\containers\ripple_RangeSet.h" />
<ClInclude Include="..\..\modules\ripple_basics\containers\ripple_SecureAllocator.h" />
@@ -1549,8 +1549,11 @@
<ClInclude Include="..\..\modules\ripple_hyperleveldb\ripple_hyperleveldb.h" />
<ClInclude Include="..\..\modules\ripple_leveldb\ripple_leveldb.h" />
<ClInclude Include="..\..\modules\ripple_mdb\ripple_mdb.h" />
<ClInclude Include="..\..\modules\ripple_net\basics\RippleSSLContext.h" />
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_HTTPRequest.h" />
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_HttpsClient.h" />
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_MultiSocket.h" />
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_MultiSocketType.h" />
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_RPCServer.h" />
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_SNTPClient.h" />
<ClInclude Include="..\..\modules\ripple_net\ripple_net.h" />

45
Builds/VisualStudio2012/RippleD.vcxproj.filters
View File

@@ -142,12 +142,6 @@
<Filter Include="[2] Build">
<UniqueIdentifier>{c69b07a2-44e5-4b06-99a9-81f5d137ea15}</UniqueIdentifier>
</Filter>
<Filter Include="[1] Ripple\ripple_asio">
<UniqueIdentifier>{a8c5d8be-1e90-4e9c-be7f-d2da53920cd4}</UniqueIdentifier>
</Filter>
<Filter Include="[1] Ripple\ripple_asio\sockets">
<UniqueIdentifier>{625992a9-7333-4782-8ee3-6ed072d02fe5}</UniqueIdentifier>
</Filter>
<Filter Include="[1] Ripple\ripple_app\boost">
<UniqueIdentifier>{8476f6e8-7411-460f-bdef-68e3166078eb}</UniqueIdentifier>
</Filter>
@@ -843,9 +837,6 @@
<ClCompile Include="..\..\Subtrees\beast\modules\beast_asio\beast_asio.cpp">
<Filter>[0] Subtrees\beast</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_asio\ripple_asio.cpp">
<Filter>[1] Ripple\ripple_asio</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_app\boost\ripple_IoService.cpp">
<Filter>[1] Ripple\ripple_app\boost</Filter>
</ClCompile>
@@ -879,6 +870,15 @@
<ClCompile Include="..\..\modules\ripple_basics\json\json_writer.cpp">
<Filter>[1] Ripple\ripple_basics\json</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_data\protocol\BuildInfo.cpp">
<Filter>[1] Ripple\ripple_data\protocol</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_net\basics\RippleSSLContext.cpp">
<Filter>[1] Ripple\ripple_net\basics</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_net\basics\ripple_MultiSocket.cpp">
<Filter>[1] Ripple\ripple_net\basics</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\modules\ripple_app\ripple_app.h">
@@ -1601,27 +1601,12 @@
<ClInclude Include="..\..\modules\ripple_app\main\ripple_RippleMain.h">
<Filter>[1] Ripple\ripple_app\main</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_asio\ripple_asio.h">
<Filter>[1] Ripple\ripple_asio</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_asio\sockets\ripple_MultiSocket.h">
<Filter>[1] Ripple\ripple_asio\sockets</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_asio\sockets\ripple_MultiSocket.cpp">
<Filter>[1] Ripple\ripple_asio\sockets</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_asio\sockets\ripple_MultiSocketType.h">
<Filter>[1] Ripple\ripple_asio\sockets</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_app\boost\ripple_IoService.h">
<Filter>[1] Ripple\ripple_app\boost</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_basics\utility\ripple_LoggedTimings.h">
<Filter>[1] Ripple\ripple_basics\utility</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_asio\sockets\RippleSSLContext.h">
<Filter>[1] Ripple\ripple_asio\sockets</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_app\websocket\WSConnection.h">
<Filter>[1] Ripple\ripple_app\websocket</Filter>
</ClInclude>
@@ -1682,6 +1667,18 @@
<ClInclude Include="..\..\modules\ripple_basics\json\json_writer.h">
<Filter>[1] Ripple\ripple_basics\json</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_data\protocol\BuildInfo.h">
<Filter>[1] Ripple\ripple_data\protocol</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_net\basics\RippleSSLContext.h">
<Filter>[1] Ripple\ripple_net\basics</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_MultiSocket.h">
<Filter>[1] Ripple\ripple_net\basics</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_MultiSocketType.h">
<Filter>[1] Ripple\ripple_net\basics</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\modules\ripple_data\protocol\ripple.proto">