merged changes from RC_1_0

This commit is contained in:
Arvid Norberg 2014-08-05 03:28:06 +00:00
parent 69a82119c8
commit 09b7c87814
2 changed files with 6 additions and 30 deletions

View File

@ -372,24 +372,14 @@ it is fully functional.</p>
<p>libtorrent runs on most major operating systems, including Windows, <p>libtorrent runs on most major operating systems, including Windows,
MacOS X, Linux, BSD and Solaris. MacOS X, Linux, BSD and Solaris.
It uses Boost.Thread, Boost.Filesystem, Boost.Date_time and various other It uses Boost.Thread, Boost.Filesystem, Boost.Date_time and various other
boost libraries as well as <a class="reference external" href="http://www.zlib.org">zlib</a> (shipped) and <a class="reference external" href="http://asio.sf.net">asio</a> (shipped). At least version boost libraries. At least version 1.46.1 of boost is required.</p>
1.34.1 of boost is required.</p>
<p>libtorrent uses asio, hence it will take full advantage of high performance <p>libtorrent uses asio, hence it will take full advantage of high performance
network APIs on the most popular platforms. I/O completion ports on windows, network APIs on the most popular platforms. I/O completion ports on windows,
epoll on linux and kqueue on MacOS X and BSD.</p> epoll on linux and kqueue on MacOS X and BSD.</p>
<p>libtorrent has been successfully compiled and tested on:</p> <p>libtorrent does not build with the following compilers:</p>
<ul class="simple">
<li>Windows 2000, XP and Vista vc7.1, vc8</li>
<li>Linux x86 GCC 3.3, GCC 3.4.2, 4.x</li>
<li>Linux PPC GCC 4.1.1</li>
<li>MacOS X (darwin), (Apple's) GCC 3.3, (Apple's) GCC 4.0</li>
<li>SunOS 5.8 GCC 3.1 and Sunpro</li>
<li>Cygwin GCC 3.3.3</li>
</ul>
<p>Fails on:</p>
<ul class="simple"> <ul class="simple">
<li>GCC 2.95.4</li> <li>GCC 2.95.4</li>
<li>msvc6</li> <li>Visual Studio 6, 7.0, 7.1</li>
</ul> </ul>
</div> </div>
</div> </div>

View File

@ -380,28 +380,14 @@ portability
libtorrent runs on most major operating systems, including Windows, libtorrent runs on most major operating systems, including Windows,
MacOS X, Linux, BSD and Solaris. MacOS X, Linux, BSD and Solaris.
It uses Boost.Thread, Boost.Filesystem, Boost.Date_time and various other It uses Boost.Thread, Boost.Filesystem, Boost.Date_time and various other
boost libraries as well as zlib_ (shipped) and asio_ (shipped). At least version boost libraries. At least version 1.46.1 of boost is required.
1.34.1 of boost is required.
.. _zlib: http://www.zlib.org
.. _asio: http://asio.sf.net
libtorrent uses asio, hence it will take full advantage of high performance libtorrent uses asio, hence it will take full advantage of high performance
network APIs on the most popular platforms. I/O completion ports on windows, network APIs on the most popular platforms. I/O completion ports on windows,
epoll on linux and kqueue on MacOS X and BSD. epoll on linux and kqueue on MacOS X and BSD.
libtorrent has been successfully compiled and tested on: libtorrent does not build with the following compilers:
* Windows 2000, XP and Vista vc7.1, vc8
* Linux x86 GCC 3.3, GCC 3.4.2, 4.x
* Linux PPC GCC 4.1.1
* MacOS X (darwin), (Apple's) GCC 3.3, (Apple's) GCC 4.0
* SunOS 5.8 GCC 3.1 and Sunpro
* Cygwin GCC 3.3.3
Fails on:
* GCC 2.95.4 * GCC 2.95.4
* msvc6 * Visual Studio 6, 7.0, 7.1