From 41b8429cd1ecaf8f911a25fdbabf1454001649ca Mon Sep 17 00:00:00 2001 From: arvidn Date: Wed, 7 Oct 2015 00:48:43 -0400 Subject: [PATCH] clean up documentation makefile and documentation generation script --- docs/building.html | 27 +- docs/examples.html | 2 + docs/gen_reference_doc.py | 4 +- docs/makefile | 28 +- docs/settings.rst | 18 +- docs/todo.html | 2374 +++++++++---------- include/libtorrent/kademlia/dht_storage.hpp | 11 +- 7 files changed, 1182 insertions(+), 1282 deletions(-) diff --git a/docs/building.html b/docs/building.html index 483396657..1f1cf37f8 100644 --- a/docs/building.html +++ b/docs/building.html @@ -172,11 +172,16 @@ building against a source distribution of boost.

a specific toolset to use (compiler) you can just add that to the commandline. For example:

-bjam msvc-7.1 boost=source
-bjam gcc-3.3 boost=source
-bjam darwin-4.0 boost=source
+bjam msvc-7.1
+bjam gcc-3.3
+bjam darwin-4.0
-

If you're building against a system installed boost, specify boost=system.

+
+

Note

+

If the environment variable BOOST_ROOT is not set, the jamfile will +attempt to link against "installed" boost libraries. i.e. assume the headers +and libraries are available in default search paths.

+

To build different versions you can also just add the name of the build variant. Some default build variants in BBv2 are release, debug, profile.

@@ -187,7 +192,7 @@ can set the runtime-linkstatic. Most operating systems will only allow linking shared against the runtime, but on windows you can do both. Example:

-bjam msvc-7.1 link=static runtime-link=static boost=source
+bjam msvc-7.1 link=static runtime-link=static

Note

@@ -254,18 +259,6 @@ For more build configuration flags see -boost -
    -
  • system - default. Tells the Jamfile that -boost is installed and should be linked against -the system libraries.
    • -
  • source - Specifies that boost is to be built -from source. The environment variable -BOOST_ROOT must be defined to point to the -boost directory.
    • -
- - boost-link