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 branch 'feature-sophia' into develop

Browse Source 
Conflicts:
	Builds/VisualStudio2012/RippleD.vcxproj
	Builds/VisualStudio2012/RippleD.vcxproj.filters
This commit is contained in:
Vinnie Falco
2013-09-19 18:27:57 -07:00
parent 927332dc01 86c868874a
commit a1596dd3d1
59 changed files with 10176 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Builds/QtCreator/rippled.pro
View File

@@ -92,6 +92,7 @@ SOURCES += \
# New style
#
SOURCES += \
../../src/ripple/sophia/ripple_sophia.c \
../../src/ripple/testoverlay/ripple_testoverlay.cpp \
../../src/ripple/validators/ripple_validators.cpp

2
Builds/VisualStudio2012/RippleD.vcxproj
View File

@@ -22,6 +22,7 @@
<ClCompile Include="..\..\build\proto\ripple.pb.cc" />
<ClCompile Include="..\..\src\ripple\beast\ripple_beast.cpp" />
<ClCompile Include="..\..\src\ripple\beast\ripple_beastc.c" />
<ClCompile Include="..\..\src\ripple\sophia\ripple_sophia.cpp" />
<ClCompile Include="..\..\src\ripple\testoverlay\impl\TestOverlay.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1430,6 +1431,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\ripple\sophia\ripple_sophia.h" />
<ClInclude Include="..\..\src\ripple\testoverlay\api\ConfigType.h" />
<ClInclude Include="..\..\src\ripple\testoverlay\api\ConnectionType.h" />
<ClInclude Include="..\..\src\ripple\testoverlay\api\InitPolicy.h" />

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

@@ -175,6 +175,9 @@
<Filter Include="[1] Ripple\ripple_websocket\autosocket">
<UniqueIdentifier>{99ac4d07-04a7-4ce3-96c7-b8ea578f1a61}</UniqueIdentifier>
</Filter>
<Filter Include="[2] Ripple %28New%29\sophia">
<UniqueIdentifier>{29b20c8e-267a-487a-9086-fb0c85a922f6}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\ripple_basics\containers\RangeSet.cpp">
@@ -918,6 +921,9 @@
<ClCompile Include="..\..\src\ripple_net\basics\AsyncService.cpp">
<Filter>[1] Ripple\ripple_net\basics</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\sophia\ripple_sophia.cpp">
<Filter>[2] Ripple %28New%29\sophia</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\ripple_basics\containers\KeyCache.h">
@@ -1821,6 +1827,9 @@
<ClInclude Include="..\..\src\ripple_net\basics\AsyncService.h">
<Filter>[1] Ripple\ripple_net\basics</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\sophia\ripple_sophia.h">
<Filter>[2] Ripple %28New%29\sophia</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\src\ripple_data\protocol\ripple.proto">