From e29ee19738a53a1bbb6bf796a514d32f8e16c5b9 Mon Sep 17 00:00:00 2001 From: Thomas Witt Date: Sat, 9 Jun 2007 03:41:50 +0000 Subject: [PATCH] Fix #958. [SVN r37952] --- getting_started/unix-variants.html | 4 +- getting_started/unix-variants.rst | 4 +- getting_started/windows.html | 107 +++++++++++++++-------------- getting_started/windows.rst | 9 ++- 4 files changed, 67 insertions(+), 57 deletions(-) diff --git a/getting_started/unix-variants.html b/getting_started/unix-variants.html index 4ca0261..5ec9d54 100644 --- a/getting_started/unix-variants.html +++ b/getting_started/unix-variants.html @@ -534,14 +534,14 @@ project.

  • You can specify the full path to each library:

     $ c++ -I path/to/boost_1_34_0 example.cpp -o example \
-   ~/boost/lib/libboost_regex-gcc-3.4-mt-d-1_34.a
+   ~/boost/lib/libboost_regex-gcc34-mt-d-1_34.a

  • You can separately specify a directory to search (with -Ldirectory) and a library name to search for (with -llibrary,2 dropping the filename's leading lib and trailing suffix (.a in this case):

     $ c++ -I path/to/boost_1_34_0 example.cpp -o example \
-   -L~/boost/lib/ -lboost_regex-gcc-3.4-mt-d-1_34
+   -L~/boost/lib/ -lboost_regex-gcc34-mt-d-1_34

    As you can see, this method is just as terse as method A for one library; it really pays off when you're using multiple diff --git a/getting_started/unix-variants.rst b/getting_started/unix-variants.rst index 9c1b752..4cf74c4 100644 --- a/getting_started/unix-variants.rst +++ b/getting_started/unix-variants.rst @@ -153,7 +153,7 @@ A. You can specify the full path to each library: .. parsed-literal:: $ c++ -I |root| example.cpp -o example **\\** - **~/boost/lib/libboost_regex-gcc-3.4-mt-d-1_34.a** + **~/boost/lib/libboost_regex-gcc34-mt-d-1_34.a** B. You can separately specify a directory to search (with ``-L``\ *directory*) and a library name to search for (with ``-l``\ @@ -163,7 +163,7 @@ B. You can separately specify a directory to search (with ``-L``\ .. parsed-literal:: $ c++ -I |root| example.cpp -o example **\\** - **-L~/boost/lib/ -lboost_regex-gcc-3.4-mt-d-1_34** + **-L~/boost/lib/ -lboost_regex-gcc34-mt-d-1_34** As you can see, this method is just as terse as method A for one library; it *really* pays off when you're using multiple diff --git a/getting_started/windows.html b/getting_started/windows.html index 83145d2..e816a89 100644 --- a/getting_started/windows.html +++ b/getting_started/windows.html @@ -26,40 +26,40 @@ not supported—they may or may not work.

    Index

    -

    1   Get Boost

    +

    1   Get Boost

    The easiest way to get a copy of Boost is to use the installer provided by Boost Consulting. We especially recommend this method if you use Microsoft Visual Studio .NET 2003 or Microsoft @@ -76,7 +76,7 @@ distribution.1

    -

    2   The Boost Distribution

    +

    2   The Boost Distribution

    This is a sketch of the resulting directory structure:

     boost_1_34_0\ .................The “boost root directory”
@@ -159,7 +159,7 @@ contains a subset of the Boost documentation.  Start with
    -

    3   Header-Only Libraries

    +

    3   Header-Only Libraries

    The first thing many people want to know is, “how do I build Boost?” The good news is that often, there's nothing to build.

    @@ -199,7 +199,7 @@ use.
    • -

    4   Build a Simple Program Using Boost

    +

    4   Build a Simple Program Using Boost

    To keep things simple, let's start by using a header-only library. The following program reads a sequence of integers from standard input, uses Boost.Lambda to multiply each number by three, and @@ -255,7 +255,7 @@ caret (^) at the end on this page use that technique to save horizontal space.

    -

    4.1   Build From the Visual Studio IDE

    +

    4.1   Build From the Visual Studio IDE

    -

    4.2   Or, Build From the Command Prompt

    +

    4.2   Or, Build From the Command Prompt

    From your computer's Start menu, if you are a Visual Studio 2005 user, select

    @@ -322,7 +322,7 @@ echo 1 2 3 | example
    -

    4.3   Errors and Warnings

    +

    4.3   Errors and Warnings

    Don't be alarmed if you see compiler warnings originating in Boost headers. We try to eliminate them, but doing so isn't always practical.5 Errors are another matter. If you're @@ -335,11 +335,11 @@ correctly identified the -

    5   Prepare to Use a Boost Library Binary

    +

    5   Prepare to Use a Boost Library Binary

    If you want to use any of the separately-compiled Boost libraries, you'll need to acquire library binaries.

    -

    5.1   Install Visual Studio (2005 or .NET 2003) Binaries

    +

    5.1   Install Visual Studio (2005 or .NET 2003) Binaries

    The installer supplied by Boost Consulting will download and install pre-compiled binaries into the lib\ subdirectory of the boost root, typically C:\Program Files\boost\boost_1_34_0\lib\. If you installed @@ -349,7 +349,7 @@ now.

    skip to the next step

    -

    5.2   Or, Build Binaries From Source

    +

    5.2   Or, Build Binaries From Source

    If you're using an earlier version of Visual C++, or a compiler from another vendor, you'll need to use Boost.Build to create your own binaries.

    @@ -361,7 +361,7 @@ installing software. To use it, you'll need an executable called bjam.

    -

    5.2.1   Get bjam

    +

    5.2.1   Get bjam

    bjam is the command-line tool that drives the Boost Build system. To build Boost binaries, you'll invoke bjam from the Boost root.

    @@ -370,7 +370,7 @@ Alternatively, you can build bjam instructions.

    -

    5.2.2   Identify Your Toolset

    +

    5.2.2   Identify Your Toolset

    First, find the toolset corresponding to your compiler in the following table.

    @@ -475,7 +475,7 @@ are using the msvc or gcc toolsets, which have special version detection code) or auto-linking will fail.

    -

    5.2.3   Select a Build Directory

    +

    5.2.3   Select a Build Directory

    Boost.Build will place all intermediate files it generates while building into the build directory. If your Boost root directory is writable, this step isn't strictly necessary: by @@ -483,7 +483,7 @@ default Boost.Build will create a

    -

    5.2.4   Invoke bjam

    +

    5.2.4   Invoke bjam

    Change your current directory to the Boost root directory and invoke bjam as follows:

    @@ -491,7 +491,7 @@ bjam --build-dir=
 
    For example, your session might look like this:4
    
 
    -C:WINDOWS> cd C:\Program Files\boost\boost_1_34_0
+C:\WINDOWS> cd C:\Program Files\boost\boost_1_34_0
 C:\Program Files\boost\boost_1_34_0> bjam ^
 More? --build-dir=%TEMP%\build-boost ^
 More? --toolset=msvc stage
@@ -523,7 +523,7 @@ be interested in:
    -

    5.3   Expected Build Output

    +

    5.3   Expected Build Output

    During the process of building Boost libraries, you can expect to see some messages printed on the console. These may include

      @@ -547,7 +547,7 @@ look something like:

    -

    5.4   In Case of Build Errors

    +

    5.4   In Case of Build Errors

    The only error messages you see when building Boost—if any—should be related to the IOStreams library's support of zip and bzip2 formats as described here. Install the relevant development @@ -565,7 +565,7 @@ questions about configuring Boost for your compiler to the