*** empty log message ***

This commit is contained in:
Arvid Norberg 2005-01-11 02:13:07 +00:00
parent 344d5b80c8
commit d6015e3c63
4 changed files with 24 additions and 40 deletions

15
Jamfile
View File

@ -2,12 +2,20 @@
import modules ; import modules ;
import os ; import os ;
import errors ;
BOOST_ROOT = [ modules.peek : BOOST_ROOT ] ; BOOST_ROOT = [ modules.peek : BOOST_ROOT ] ;
ECHO "BOOST_ROOT =" $(BOOST_ROOT) ; ECHO "BOOST_ROOT =" $(BOOST_ROOT) ;
ECHO "OS =" [ os.name ] ; ECHO "OS =" [ os.name ] ;
if ! $(BOOST_ROOT)
{
errors.user-error
"BOOST_ROOT must be set to your boost installation path." ;
}
use-project /boost : $(BOOST_ROOT) ; use-project /boost : $(BOOST_ROOT) ;
project torrent project torrent
@ -33,6 +41,7 @@ project torrent
<include>./include <include>./include
<include>$(BOOST_ROOT) <include>$(BOOST_ROOT)
<variant>release:<define>NDEBUG <variant>release:<define>NDEBUG
<variant>debug:<define>TORRENT_VERBOSE_LOGGING
<define>BOOST_ALL_NO_LIB <define>BOOST_ALL_NO_LIB
; ;
@ -42,6 +51,7 @@ SOURCES =
alert.cpp alert.cpp
entry.cpp entry.cpp
escape_string.cpp escape_string.cpp
file.cpp
identify_client.cpp identify_client.cpp
peer_connection.cpp peer_connection.cpp
piece_picker.cpp piece_picker.cpp
@ -82,11 +92,6 @@ LIBS = ;
{ {
lib wsock32 : : <name>wsock32.lib ; lib wsock32 : : <name>wsock32.lib ;
LIBS += wsock32 ; LIBS += wsock32 ;
SOURCES += file_win.cpp ;
}
else
{
SOURCES += file.cpp ;
} }
lib torrent lib torrent

View File

@ -91,14 +91,15 @@ on how to do this here__ (see Anonymous CVS access).
__ http://sourceforge.net/cvs/?group_id=79942 __ http://sourceforge.net/cvs/?group_id=79942
The easiest way to build libtorrent is probably to use `boost-build`_. Make sure you install it The easiest way to build libtorrent is probably to use `boost-build`_. Make sure you install it
correctly by setting the environment variable ``BOOST_BUILD_PATH`` and modifying the correctly by setting the environment variable ``BOOST_BUILD_PATH`` to point to your boost build
``user_config.jam`` to reflect the toolsets you have installed. installation. Also you have to modify the ``user_config.jam`` to reflect the toolsets you have installed.
(if you're building with gcc, uncomment the line "using gcc ;")
.. _`boost-build`: http://sourceforge.net/project/showfiles.php?group_id=7586&package_id=80982 .. _`boost-build`: http://sourceforge.net/project/showfiles.php?group_id=7586&package_id=80982&release_id=278763
You also need to install `boost 1.31.0`__. You also need to install boost__ (at least version 1.31.0).
__ http://sourceforge.net/project/showfiles.php?group_id=7586&package_id=8041&release_id=214915 __ http://sourceforge.net/project/showfiles.php?group_id=7586&package_id=8041&release_id=284047
Before you invoke ``bjam`` you have to set the environment variable ``BOOST_ROOT`` to the Before you invoke ``bjam`` you have to set the environment variable ``BOOST_ROOT`` to the
path where you installed boost. This will be used to build and link against the required path where you installed boost. This will be used to build and link against the required
@ -133,19 +134,13 @@ from a cygwin terminal, you'll have to run it from a ``cmd`` terminal. The same
cygwin, if you're building with gcc (mingw) you'll have to run it from a cygwin terminal. cygwin, if you're building with gcc (mingw) you'll have to run it from a cygwin terminal.
Also, make sure the paths are correct in the different environments. In cygwin, the paths Also, make sure the paths are correct in the different environments. In cygwin, the paths
(``BOOST_BUILD_PATH`` and ``BOOST_ROOT``) should be in the typical unix-format (e.g. (``BOOST_BUILD_PATH`` and ``BOOST_ROOT``) should be in the typical unix-format (e.g.
``/cygdrive/c/boost_1_31_0``). In the windows environment, they should have the typical ``/cygdrive/c/boost_1_32_0``). In the windows environment, they should have the typical
windows format (``c:/boost_1_31_0``). windows format (``c:/boost_1_32_0``).
If you're building in developer studio, you may have to set the compiler options If you're building in developer studio, you may have to set the compiler options
"force conformance in for loop scope", "treat wchar_t as built-in type" and "force conformance in for loop scope", "treat wchar_t as built-in type" and
"Enable Run-Time Type Info" to Yes. "Enable Run-Time Type Info" to Yes.
If you're building in developer studio 6, you will probably have to use the previous
version of boost, `boost 1.30.2`__. And you'll definately have to use at least service
pack 5 (sp5).
__ http://sourceforge.net/project/showfiles.php?group_id=7586&package_id=8041&release_id=178835
release and debug builds release and debug builds
------------------------ ------------------------
@ -177,9 +172,7 @@ table below for which defines you can use to control the build. The ``Jamfile``
If you experience that libtorrent uses unreasonable amounts of cpu, it will definately help to If you experience that libtorrent uses unreasonable amounts of cpu, it will definately help to
define ``NDEBUG``. define ``NDEBUG``, since it will remove the invariant checks within the library.
using using

View File

@ -4,24 +4,10 @@ project
: requirements <source>/torrent <threading>multi : requirements <source>/torrent <threading>multi
; ;
exe client_test exe client_test : client_test.cpp ;
: client_test.cpp exe simple_client : simple_client.cpp ;
; exe dump_torrent : dump_torrent.cpp ;
exe make_torrent : make_torrent.cpp ;
exe simple_client
: simple_client.cpp
;
exe dump_torrent
: dump_torrent.cpp
;
exe make_torrent
: make_torrent.cpp
;
stage . : dump_torrent make_torrent simple_client client_test ; stage . : dump_torrent make_torrent simple_client client_test ;

View File

@ -106,7 +106,7 @@ namespace libtorrent
struct piece_checker_data struct piece_checker_data
{ {
piece_checker_data() piece_checker_data()
: progress(0.f), abort(false), processing(false) {} : processing(false), progress(0.f), abort(false) {}
boost::shared_ptr<torrent> torrent_ptr; boost::shared_ptr<torrent> torrent_ptr;
boost::filesystem::path save_path; boost::filesystem::path save_path;