PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-22 04:04:16 +00:00
Code Issues Releases Activity

Merge pull request #147 from space-and-time/master

Browse Source 
Fixed windows build, assertion failed
This commit is contained in:
orignal 2015-01-12 07:29:03 -05:00
commit c37d13af84
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
I2PControl.cpp
View File

@ -1,3 +1,5 @@
#include "I2PControl.h"
#include <sstream> #include <sstream>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree.hpp>
@ -8,7 +10,6 @@
#include "Daemon.h" #include "Daemon.h"
#include "Tunnel.h" #include "Tunnel.h"
#include "Timestamp.h" #include "Timestamp.h"
#include "I2PControl.h"
namespace i2p namespace i2p
{ {

12
Win32/i2pd.vcxproj
View File

@ -22,7 +22,7 @@
<ClCompile Include="..\AddressBook.cpp" /> <ClCompile Include="..\AddressBook.cpp" />
<ClCompile Include="..\aes.cpp" /> <ClCompile Include="..\aes.cpp" />
<ClCompile Include="..\base64.cpp" /> <ClCompile Include="..\base64.cpp" />
<ClCompile Include="..\BOB.cpp" /> <ClCompile Include="..\BOB.cpp" />
<ClCompile Include="..\CryptoConst.cpp" /> <ClCompile Include="..\CryptoConst.cpp" />
<ClCompile Include="..\Daemon.cpp" /> <ClCompile Include="..\Daemon.cpp" />
<ClCompile Include="..\DaemonWin32.cpp" /> <ClCompile Include="..\DaemonWin32.cpp" />
@ -32,6 +32,7 @@
<ClCompile Include="..\I2NPProtocol.cpp" /> <ClCompile Include="..\I2NPProtocol.cpp" />
<ClCompile Include="..\i2p.cpp" /> <ClCompile Include="..\i2p.cpp" />
<ClCompile Include="..\I2PEndian.cpp" /> <ClCompile Include="..\I2PEndian.cpp" />
<ClCompile Include="..\I2PService.cpp" />
<ClCompile Include="..\Identity.cpp" /> <ClCompile Include="..\Identity.cpp" />
<ClCompile Include="..\LeaseSet.cpp" /> <ClCompile Include="..\LeaseSet.cpp" />
<ClCompile Include="..\Log.cpp" /> <ClCompile Include="..\Log.cpp" />
@ -57,14 +58,14 @@
<ClCompile Include="..\util.cpp" /> <ClCompile Include="..\util.cpp" />
<ClCompile Include="..\SOCKS.cpp" /> <ClCompile Include="..\SOCKS.cpp" />
<ClCompile Include="..\I2PTunnel.cpp" /> <ClCompile Include="..\I2PTunnel.cpp" />
<ClCompile Include="..\I2PControl.cpp" /> <ClCompile Include="..\I2PControl.cpp" />
<ClCompile Include="..\ClientContext.cpp" /> <ClCompile Include="..\ClientContext.cpp" />
<ClCompile Include="Win32Service.cpp" /> <ClCompile Include="Win32Service.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\AddressBook.h" /> <ClInclude Include="..\AddressBook.h" />
<ClInclude Include="..\base64.h" /> <ClInclude Include="..\base64.h" />
<ClInclude Include="..\BOB.h" /> <ClInclude Include="..\BOB.h" />
<ClInclude Include="..\CryptoConst.h" /> <ClInclude Include="..\CryptoConst.h" />
<ClInclude Include="..\Daemon.h" /> <ClInclude Include="..\Daemon.h" />
<ClInclude Include="..\ElGamal.h" /> <ClInclude Include="..\ElGamal.h" />
@ -73,6 +74,7 @@
<ClInclude Include="..\HTTPServer.h" /> <ClInclude Include="..\HTTPServer.h" />
<ClInclude Include="..\I2NPProtocol.h" /> <ClInclude Include="..\I2NPProtocol.h" />
<ClInclude Include="..\I2PEndian.h" /> <ClInclude Include="..\I2PEndian.h" />
<ClInclude Include="..\I2PService.h" />
<ClInclude Include="..\Identity.h" /> <ClInclude Include="..\Identity.h" />
<ClInclude Include="..\LeaseSet.h" /> <ClInclude Include="..\LeaseSet.h" />
<ClInclude Include="..\LittleBigEndian.h" /> <ClInclude Include="..\LittleBigEndian.h" />
@ -103,7 +105,7 @@
<ClInclude Include="..\util.h" /> <ClInclude Include="..\util.h" />
<ClInclude Include="..\SOCKS.h" /> <ClInclude Include="..\SOCKS.h" />
<ClInclude Include="..\I2PTunnel.h" /> <ClInclude Include="..\I2PTunnel.h" />
<ClInclude Include="..\I2PControl.h" /> <ClInclude Include="..\I2PControl.h" />
<ClInclude Include="..\version.h" /> <ClInclude Include="..\version.h" />
<ClInclude Include="..\Signature.h" /> <ClInclude Include="..\Signature.h" />
<ClInclude Include="..\ClientContext.h" /> <ClInclude Include="..\ClientContext.h" />
@ -282,4 +284,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

18
Win32/i2pd.vcxproj.filters
View File

@ -135,6 +135,15 @@
<ClCompile Include="..\ClientContext.cpp"> <ClCompile Include="..\ClientContext.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\BOB.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\I2PControl.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\I2PService.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\Identity.h"> <ClInclude Include="..\Identity.h">
@ -275,6 +284,15 @@
<ClInclude Include="resource.h"> <ClInclude Include="resource.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\BOB.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\I2PControl.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\I2PService.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="Resource.rc"> <ResourceCompile Include="Resource.rc">