Browse Source

Fix #958.

[SVN r37952]
Thomas Witt 19 years ago
parent
commit
43a8ace44d

+ 2 - 2
more/getting_started/unix-variants.html

@@ -534,14 +534,14 @@ project.</li>
 <li><p class="first">You can specify the full path to each library:</p>
 <li><p class="first">You can specify the full path to each library:</p>
 <pre class="literal-block">
 <pre class="literal-block">
 $ c++ -I <em>path/to/</em><tt class="docutils literal"><span class="pre">boost_1_34_0</span></tt> example.cpp -o example <strong>\</strong>
 $ c++ -I <em>path/to/</em><tt class="docutils literal"><span class="pre">boost_1_34_0</span></tt> example.cpp -o example <strong>\</strong>
-   <strong>~/boost/lib/libboost_regex-gcc-3.4-mt-d-1_34.a</strong>
+   <strong>~/boost/lib/libboost_regex-gcc34-mt-d-1_34.a</strong>
 </pre>
 </pre>
 </li>
 </li>
 <li><p class="first">You can separately specify a directory to search (with <tt class="docutils literal"><span class="pre">-L</span></tt><em>directory</em>) and a library name to search for (with <tt class="docutils literal"><span class="pre">-l</span></tt><em>library</em>,<a class="footnote-reference" href="#lowercase-l" id="id12"><sup>2</sup></a> dropping the filename's leading <tt class="docutils literal"><span class="pre">lib</span></tt> and trailing
 <li><p class="first">You can separately specify a directory to search (with <tt class="docutils literal"><span class="pre">-L</span></tt><em>directory</em>) and a library name to search for (with <tt class="docutils literal"><span class="pre">-l</span></tt><em>library</em>,<a class="footnote-reference" href="#lowercase-l" id="id12"><sup>2</sup></a> dropping the filename's leading <tt class="docutils literal"><span class="pre">lib</span></tt> and trailing
 suffix (<tt class="docutils literal"><span class="pre">.a</span></tt> in this case):</p>
 suffix (<tt class="docutils literal"><span class="pre">.a</span></tt> in this case):</p>
 <pre class="literal-block">
 <pre class="literal-block">
 $ c++ -I <em>path/to/</em><tt class="docutils literal"><span class="pre">boost_1_34_0</span></tt> example.cpp -o example <strong>\</strong>
 $ c++ -I <em>path/to/</em><tt class="docutils literal"><span class="pre">boost_1_34_0</span></tt> example.cpp -o example <strong>\</strong>
-   <strong>-L~/boost/lib/ -lboost_regex-gcc-3.4-mt-d-1_34</strong>
+   <strong>-L~/boost/lib/ -lboost_regex-gcc34-mt-d-1_34</strong>
 </pre>
 </pre>
 <p>As you can see, this method is just as terse as method A for one
 <p>As you can see, this method is just as terse as method A for one
 library; it <em>really</em> pays off when you're using multiple
 library; it <em>really</em> pays off when you're using multiple

+ 2 - 2
more/getting_started/unix-variants.rst

@@ -153,7 +153,7 @@ A. You can specify the full path to each library:
    .. parsed-literal::
    .. parsed-literal::
 
 
      $ c++ -I |root| example.cpp -o example **\\**
      $ 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``\
 B. You can separately specify a directory to search (with ``-L``\
    *directory*) and a library name to search for (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::
    .. parsed-literal::
 
 
      $ c++ -I |root| example.cpp -o example **\\**
      $ 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
    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
    library; it *really* pays off when you're using multiple

+ 55 - 52
more/getting_started/windows.html

@@ -26,40 +26,40 @@ not supported—they may or may not work.</p>
 <div class="contents topic" id="index">
 <div class="contents topic" id="index">
 <p class="topic-title first">Index</p>
 <p class="topic-title first">Index</p>
 <ul class="auto-toc simple">
 <ul class="auto-toc simple">
-<li><a class="reference internal" href="#get-boost" id="id22">1&nbsp;&nbsp;&nbsp;Get Boost</a></li>
-<li><a class="reference internal" href="#the-boost-distribution" id="id23">2&nbsp;&nbsp;&nbsp;The Boost Distribution</a></li>
-<li><a class="reference internal" href="#header-only-libraries" id="id24">3&nbsp;&nbsp;&nbsp;Header-Only Libraries</a></li>
-<li><a class="reference internal" href="#build-a-simple-program-using-boost" id="id25">4&nbsp;&nbsp;&nbsp;Build a Simple Program Using Boost</a><ul class="auto-toc">
-<li><a class="reference internal" href="#build-from-the-visual-studio-ide" id="id26">4.1&nbsp;&nbsp;&nbsp;Build From the Visual Studio IDE</a></li>
-<li><a class="reference internal" href="#or-build-from-the-command-prompt" id="id27">4.2&nbsp;&nbsp;&nbsp;Or, Build From the Command Prompt</a></li>
-<li><a class="reference internal" href="#errors-and-warnings" id="id28">4.3&nbsp;&nbsp;&nbsp;Errors and Warnings</a></li>
+<li><a class="reference internal" href="#get-boost" id="id23">1&nbsp;&nbsp;&nbsp;Get Boost</a></li>
+<li><a class="reference internal" href="#the-boost-distribution" id="id24">2&nbsp;&nbsp;&nbsp;The Boost Distribution</a></li>
+<li><a class="reference internal" href="#header-only-libraries" id="id25">3&nbsp;&nbsp;&nbsp;Header-Only Libraries</a></li>
+<li><a class="reference internal" href="#build-a-simple-program-using-boost" id="id26">4&nbsp;&nbsp;&nbsp;Build a Simple Program Using Boost</a><ul class="auto-toc">
+<li><a class="reference internal" href="#build-from-the-visual-studio-ide" id="id27">4.1&nbsp;&nbsp;&nbsp;Build From the Visual Studio IDE</a></li>
+<li><a class="reference internal" href="#or-build-from-the-command-prompt" id="id28">4.2&nbsp;&nbsp;&nbsp;Or, Build From the Command Prompt</a></li>
+<li><a class="reference internal" href="#errors-and-warnings" id="id29">4.3&nbsp;&nbsp;&nbsp;Errors and Warnings</a></li>
 </ul>
 </ul>
 </li>
 </li>
-<li><a class="reference internal" href="#prepare-to-use-a-boost-library-binary" id="id29">5&nbsp;&nbsp;&nbsp;Prepare to Use a Boost Library Binary</a><ul class="auto-toc">
-<li><a class="reference internal" href="#install-visual-studio-2005-or-net-2003-binaries" id="id30">5.1&nbsp;&nbsp;&nbsp;Install Visual Studio (2005 or .NET 2003) Binaries</a></li>
-<li><a class="reference internal" href="#or-build-binaries-from-source" id="id31">5.2&nbsp;&nbsp;&nbsp;Or, Build Binaries From Source</a><ul class="auto-toc">
-<li><a class="reference internal" href="#get-bjam" id="id32">5.2.1&nbsp;&nbsp;&nbsp;Get <tt class="docutils literal"><span class="pre">bjam</span></tt></a></li>
-<li><a class="reference internal" href="#identify-your-toolset" id="id33">5.2.2&nbsp;&nbsp;&nbsp;Identify Your Toolset</a></li>
-<li><a class="reference internal" href="#select-a-build-directory" id="id34">5.2.3&nbsp;&nbsp;&nbsp;Select a Build Directory</a></li>
-<li><a class="reference internal" href="#invoke-bjam" id="id35">5.2.4&nbsp;&nbsp;&nbsp;Invoke <tt class="docutils literal"><span class="pre">bjam</span></tt></a></li>
+<li><a class="reference internal" href="#prepare-to-use-a-boost-library-binary" id="id30">5&nbsp;&nbsp;&nbsp;Prepare to Use a Boost Library Binary</a><ul class="auto-toc">
+<li><a class="reference internal" href="#install-visual-studio-2005-or-net-2003-binaries" id="id31">5.1&nbsp;&nbsp;&nbsp;Install Visual Studio (2005 or .NET 2003) Binaries</a></li>
+<li><a class="reference internal" href="#or-build-binaries-from-source" id="id32">5.2&nbsp;&nbsp;&nbsp;Or, Build Binaries From Source</a><ul class="auto-toc">
+<li><a class="reference internal" href="#get-bjam" id="id33">5.2.1&nbsp;&nbsp;&nbsp;Get <tt class="docutils literal"><span class="pre">bjam</span></tt></a></li>
+<li><a class="reference internal" href="#identify-your-toolset" id="id34">5.2.2&nbsp;&nbsp;&nbsp;Identify Your Toolset</a></li>
+<li><a class="reference internal" href="#select-a-build-directory" id="id35">5.2.3&nbsp;&nbsp;&nbsp;Select a Build Directory</a></li>
+<li><a class="reference internal" href="#invoke-bjam" id="id36">5.2.4&nbsp;&nbsp;&nbsp;Invoke <tt class="docutils literal"><span class="pre">bjam</span></tt></a></li>
 </ul>
 </ul>
 </li>
 </li>
-<li><a class="reference internal" href="#expected-build-output" id="id36">5.3&nbsp;&nbsp;&nbsp;Expected Build Output</a></li>
-<li><a class="reference internal" href="#in-case-of-build-errors" id="id37">5.4&nbsp;&nbsp;&nbsp;In Case of Build Errors</a></li>
+<li><a class="reference internal" href="#expected-build-output" id="id37">5.3&nbsp;&nbsp;&nbsp;Expected Build Output</a></li>
+<li><a class="reference internal" href="#in-case-of-build-errors" id="id38">5.4&nbsp;&nbsp;&nbsp;In Case of Build Errors</a></li>
 </ul>
 </ul>
 </li>
 </li>
-<li><a class="reference internal" href="#link-your-program-to-a-boost-library" id="id38">6&nbsp;&nbsp;&nbsp;Link Your Program to a Boost Library</a><ul class="auto-toc">
-<li><a class="reference internal" href="#link-from-within-the-visual-studio-ide" id="id39">6.1&nbsp;&nbsp;&nbsp;Link From Within the Visual Studio IDE</a></li>
-<li><a class="reference internal" href="#or-link-from-the-command-prompt" id="id40">6.2&nbsp;&nbsp;&nbsp;Or, Link From the Command Prompt</a></li>
-<li><a class="reference internal" href="#library-naming" id="id41">6.3&nbsp;&nbsp;&nbsp;Library Naming</a></li>
-<li><a class="reference internal" href="#test-your-program" id="id42">6.4&nbsp;&nbsp;&nbsp;Test Your Program</a></li>
+<li><a class="reference internal" href="#link-your-program-to-a-boost-library" id="id39">6&nbsp;&nbsp;&nbsp;Link Your Program to a Boost Library</a><ul class="auto-toc">
+<li><a class="reference internal" href="#link-from-within-the-visual-studio-ide" id="id40">6.1&nbsp;&nbsp;&nbsp;Link From Within the Visual Studio IDE</a></li>
+<li><a class="reference internal" href="#or-link-from-the-command-prompt" id="id41">6.2&nbsp;&nbsp;&nbsp;Or, Link From the Command Prompt</a></li>
+<li><a class="reference internal" href="#library-naming" id="id42">6.3&nbsp;&nbsp;&nbsp;Library Naming</a></li>
+<li><a class="reference internal" href="#test-your-program" id="id43">6.4&nbsp;&nbsp;&nbsp;Test Your Program</a></li>
 </ul>
 </ul>
 </li>
 </li>
-<li><a class="reference internal" href="#conclusion-and-further-resources" id="id43">7&nbsp;&nbsp;&nbsp;Conclusion and Further Resources</a></li>
+<li><a class="reference internal" href="#conclusion-and-further-resources" id="id44">7&nbsp;&nbsp;&nbsp;Conclusion and Further Resources</a></li>
 </ul>
 </ul>
 </div>
 </div>
 <div class="section" id="get-boost">
 <div class="section" id="get-boost">
-<h1><a class="toc-backref" href="#id22">1&nbsp;&nbsp;&nbsp;Get Boost</a></h1>
+<h1><a class="toc-backref" href="#id23">1&nbsp;&nbsp;&nbsp;Get Boost</a></h1>
 <p>The easiest way to get a copy of Boost is to use the <a class="reference external" href="http://www.boost-consulting.com/download/windows">installer</a>
 <p>The easiest way to get a copy of Boost is to use the <a class="reference external" href="http://www.boost-consulting.com/download/windows">installer</a>
 provided by <a class="reference external" href="http://www.boost-consulting.com">Boost Consulting</a>.  We especially recommend this
 provided by <a class="reference external" href="http://www.boost-consulting.com">Boost Consulting</a>.  We especially recommend this
 method if you use Microsoft Visual Studio .NET 2003 or Microsoft
 method if you use Microsoft Visual Studio .NET 2003 or Microsoft
@@ -76,7 +76,7 @@ distribution.<a class="footnote-reference" href="#zip" id="id2"><sup>1</sup></a>
 <!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -->
 <!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -->
 </div>
 </div>
 <div class="section" id="the-boost-distribution">
 <div class="section" id="the-boost-distribution">
-<h1><a class="toc-backref" href="#id23">2&nbsp;&nbsp;&nbsp;The Boost Distribution</a></h1>
+<h1><a class="toc-backref" href="#id24">2&nbsp;&nbsp;&nbsp;The Boost Distribution</a></h1>
 <p>This is a sketch of the resulting directory structure:</p>
 <p>This is a sketch of the resulting directory structure:</p>
 <pre class="literal-block">
 <pre class="literal-block">
 <strong>boost_1_34_0</strong><strong>\</strong> .................<em>The “boost root directory”</em>
 <strong>boost_1_34_0</strong><strong>\</strong> .................<em>The “boost root directory”</em>
@@ -159,7 +159,7 @@ contains a subset of the Boost documentation.  Start with
 <!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -->
 <!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -->
 </div>
 </div>
 <div class="section" id="header-only-libraries">
 <div class="section" id="header-only-libraries">
-<h1><a class="toc-backref" href="#id24">3&nbsp;&nbsp;&nbsp;Header-Only Libraries</a></h1>
+<h1><a class="toc-backref" href="#id25">3&nbsp;&nbsp;&nbsp;Header-Only Libraries</a></h1>
 <p>The first thing many people want to know is, “how do I build
 <p>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.</p>
 Boost?”  The good news is that often, there's nothing to build.</p>
 <div class="admonition-nothing-to-build admonition">
 <div class="admonition-nothing-to-build admonition">
@@ -199,7 +199,7 @@ use</strong>.</li>
 <!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -->
 <!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -->
 </div>
 </div>
 <div class="section" id="build-a-simple-program-using-boost">
 <div class="section" id="build-a-simple-program-using-boost">
-<h1><a class="toc-backref" href="#id25">4&nbsp;&nbsp;&nbsp;Build a Simple Program Using Boost</a></h1>
+<h1><a class="toc-backref" href="#id26">4&nbsp;&nbsp;&nbsp;Build a Simple Program Using Boost</a></h1>
 <p>To keep things simple, let's start by using a header-only library.
 <p>To keep things simple, let's start by using a header-only library.
 The following program reads a sequence of integers from standard
 The following program reads a sequence of integers from standard
 input, uses Boost.Lambda to multiply each number by three, and
 input, uses Boost.Lambda to multiply each number by three, and
@@ -255,7 +255,7 @@ caret (<tt class="docutils literal"><span class="pre">^</span></tt>) at the end
 on this page use that technique to save horizontal space.</p>
 on this page use that technique to save horizontal space.</p>
 </div>
 </div>
 <div class="section" id="build-from-the-visual-studio-ide">
 <div class="section" id="build-from-the-visual-studio-ide">
-<span id="vs-header-only"></span><h2><a class="toc-backref" href="#id26">4.1&nbsp;&nbsp;&nbsp;Build From the Visual Studio IDE</a></h2>
+<span id="vs-header-only"></span><h2><a class="toc-backref" href="#id27">4.1&nbsp;&nbsp;&nbsp;Build From the Visual Studio IDE</a></h2>
 <ul>
 <ul>
 <li><p class="first">From Visual Studio's <em>File</em> menu, select <em>New</em> &gt; <em>Project…</em></p>
 <li><p class="first">From Visual Studio's <em>File</em> menu, select <em>New</em> &gt; <em>Project…</em></p>
 </li>
 </li>
@@ -296,7 +296,7 @@ Return key.</p>
 <p><a class="reference internal" href="#errors-and-warnings"><em>skip to the next step</em></a></p>
 <p><a class="reference internal" href="#errors-and-warnings"><em>skip to the next step</em></a></p>
 </div>
 </div>
 <div class="section" id="or-build-from-the-command-prompt">
 <div class="section" id="or-build-from-the-command-prompt">
-<h2><a class="toc-backref" href="#id27">4.2&nbsp;&nbsp;&nbsp;Or, Build From the Command Prompt</a></h2>
+<h2><a class="toc-backref" href="#id28">4.2&nbsp;&nbsp;&nbsp;Or, Build From the Command Prompt</a></h2>
 <p>From your computer's <em>Start</em> menu, if you are a Visual
 <p>From your computer's <em>Start</em> menu, if you are a Visual
 Studio 2005 user, select</p>
 Studio 2005 user, select</p>
 <blockquote>
 <blockquote>
@@ -322,7 +322,7 @@ echo 1 2 3 | example
 <!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -->
 <!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -->
 </div>
 </div>
 <div class="section" id="errors-and-warnings">
 <div class="section" id="errors-and-warnings">
-<h2><a class="toc-backref" href="#id28">4.3&nbsp;&nbsp;&nbsp;Errors and Warnings</a></h2>
+<h2><a class="toc-backref" href="#id29">4.3&nbsp;&nbsp;&nbsp;Errors and Warnings</a></h2>
 <p>Don't be alarmed if you see compiler warnings originating in Boost
 <p>Don't be alarmed if you see compiler warnings originating in Boost
 headers.  We try to eliminate them, but doing so isn't always
 headers.  We try to eliminate them, but doing so isn't always
 practical.<a class="footnote-reference" href="#warnings" id="id7"><sup>5</sup></a> <strong>Errors are another matter</strong>.  If you're
 practical.<a class="footnote-reference" href="#warnings" id="id7"><sup>5</sup></a> <strong>Errors are another matter</strong>.  If you're
@@ -335,11 +335,11 @@ correctly identified the <a class="reference internal" href="#boost-root-directo
 </div>
 </div>
 </div>
 </div>
 <div class="section" id="prepare-to-use-a-boost-library-binary">
 <div class="section" id="prepare-to-use-a-boost-library-binary">
-<h1><a class="toc-backref" href="#id29">5&nbsp;&nbsp;&nbsp;Prepare to Use a Boost Library Binary</a></h1>
+<h1><a class="toc-backref" href="#id30">5&nbsp;&nbsp;&nbsp;Prepare to Use a Boost Library Binary</a></h1>
 <p>If you want to use any of the separately-compiled Boost libraries,
 <p>If you want to use any of the separately-compiled Boost libraries,
 you'll need to acquire library binaries.</p>
 you'll need to acquire library binaries.</p>
 <div class="section" id="install-visual-studio-2005-or-net-2003-binaries">
 <div class="section" id="install-visual-studio-2005-or-net-2003-binaries">
-<h2><a class="toc-backref" href="#id30">5.1&nbsp;&nbsp;&nbsp;Install Visual Studio (2005 or .NET 2003) Binaries</a></h2>
+<h2><a class="toc-backref" href="#id31">5.1&nbsp;&nbsp;&nbsp;Install Visual Studio (2005 or .NET 2003) Binaries</a></h2>
 <p>The <a class="reference external" href="http://www.boost-consulting.com/download/windows">installer</a> supplied by Boost Consulting will download and
 <p>The <a class="reference external" href="http://www.boost-consulting.com/download/windows">installer</a> supplied by Boost Consulting will download and
 install pre-compiled binaries into the <tt class="docutils literal"><span class="pre">lib\</span></tt> subdirectory of the
 install pre-compiled binaries into the <tt class="docutils literal"><span class="pre">lib\</span></tt> subdirectory of the
 boost root, typically <tt class="docutils literal"><span class="pre">C:\Program</span> <span class="pre">Files\boost\</span></tt><tt class="docutils literal"><span class="pre">boost_1_34_0</span></tt><tt class="docutils literal"><span class="pre">\lib\</span></tt>.  If you installed
 boost root, typically <tt class="docutils literal"><span class="pre">C:\Program</span> <span class="pre">Files\boost\</span></tt><tt class="docutils literal"><span class="pre">boost_1_34_0</span></tt><tt class="docutils literal"><span class="pre">\lib\</span></tt>.  If you installed
@@ -349,7 +349,7 @@ now.</p>
 <p><a class="reference internal" href="#link-your-program-to-a-boost-library"><em>skip to the next step</em></a></p>
 <p><a class="reference internal" href="#link-your-program-to-a-boost-library"><em>skip to the next step</em></a></p>
 </div>
 </div>
 <div class="section" id="or-build-binaries-from-source">
 <div class="section" id="or-build-binaries-from-source">
-<h2><a class="toc-backref" href="#id31">5.2&nbsp;&nbsp;&nbsp;Or, Build Binaries From Source</a></h2>
+<h2><a class="toc-backref" href="#id32">5.2&nbsp;&nbsp;&nbsp;Or, Build Binaries From Source</a></h2>
 <p>If you're using an earlier version of Visual C++, or a compiler
 <p>If you're using an earlier version of Visual C++, or a compiler
 from another vendor, you'll need to use <a class="reference external" href="../../tools/build/index.html">Boost.Build</a> to create your
 from another vendor, you'll need to use <a class="reference external" href="../../tools/build/index.html">Boost.Build</a> to create your
 own binaries.</p>
 own binaries.</p>
@@ -361,7 +361,7 @@ installing software.  To use it, you'll need an executable called
 <tt class="docutils literal"><span class="pre">bjam</span></tt>.</p>
 <tt class="docutils literal"><span class="pre">bjam</span></tt>.</p>
 <!-- .. _Boost.Jam documentation: Boost.Jam_ -->
 <!-- .. _Boost.Jam documentation: Boost.Jam_ -->
 <div class="section" id="get-bjam">
 <div class="section" id="get-bjam">
-<h3><a class="toc-backref" href="#id32">5.2.1&nbsp;&nbsp;&nbsp;Get <tt class="docutils literal"><span class="pre">bjam</span></tt></a></h3>
+<h3><a class="toc-backref" href="#id33">5.2.1&nbsp;&nbsp;&nbsp;Get <tt class="docutils literal"><span class="pre">bjam</span></tt></a></h3>
 <p><tt class="docutils literal"><span class="pre">bjam</span></tt> is the <a class="reference internal" href="#command-line-tool">command-line tool</a> that drives the Boost Build
 <p><tt class="docutils literal"><span class="pre">bjam</span></tt> is the <a class="reference internal" href="#command-line-tool">command-line tool</a> that drives the Boost Build
 system.  To build Boost binaries, you'll invoke <tt class="docutils literal"><span class="pre">bjam</span></tt> from the
 system.  To build Boost binaries, you'll invoke <tt class="docutils literal"><span class="pre">bjam</span></tt> from the
 Boost root.</p>
 Boost root.</p>
@@ -370,7 +370,7 @@ Alternatively, you can build <tt class="docutils literal"><span class="pre">bjam
 instructions</a>.</p>
 instructions</a>.</p>
 </div>
 </div>
 <div class="section" id="identify-your-toolset">
 <div class="section" id="identify-your-toolset">
-<span id="toolset-name"></span><span id="toolset"></span><h3><a class="toc-backref" href="#id33">5.2.2&nbsp;&nbsp;&nbsp;Identify Your Toolset</a></h3>
+<span id="toolset-name"></span><span id="toolset"></span><h3><a class="toc-backref" href="#id34">5.2.2&nbsp;&nbsp;&nbsp;Identify Your Toolset</a></h3>
 <p>First, find the toolset corresponding to your compiler in the
 <p>First, find the toolset corresponding to your compiler in the
 following table.</p>
 following table.</p>
 <div class="note">
 <div class="note">
@@ -475,7 +475,7 @@ are using the msvc or gcc toolsets, which have special version
 detection code) or <a class="reference internal" href="#auto-linking">auto-linking</a> will fail.</p>
 detection code) or <a class="reference internal" href="#auto-linking">auto-linking</a> will fail.</p>
 </div>
 </div>
 <div class="section" id="select-a-build-directory">
 <div class="section" id="select-a-build-directory">
-<span id="id12"></span><span id="build-directory"></span><h3><a class="toc-backref" href="#id34">5.2.3&nbsp;&nbsp;&nbsp;Select a Build Directory</a></h3>
+<span id="id12"></span><span id="build-directory"></span><h3><a class="toc-backref" href="#id35">5.2.3&nbsp;&nbsp;&nbsp;Select a Build Directory</a></h3>
 <p><a class="reference external" href="../../tools/build/index.html">Boost.Build</a> will place all intermediate files it generates while
 <p><a class="reference external" href="../../tools/build/index.html">Boost.Build</a> will place all intermediate files it generates while
 building into the <strong>build directory</strong>.  If your Boost root
 building into the <strong>build directory</strong>.  If your Boost root
 directory is writable, this step isn't strictly necessary: by
 directory is writable, this step isn't strictly necessary: by
@@ -483,7 +483,7 @@ default Boost.Build will create a <tt class="docutils literal"><span class="pre"
 purpose in your current working directory.</p>
 purpose in your current working directory.</p>
 </div>
 </div>
 <div class="section" id="invoke-bjam">
 <div class="section" id="invoke-bjam">
-<h3><a class="toc-backref" href="#id35">5.2.4&nbsp;&nbsp;&nbsp;Invoke <tt class="docutils literal"><span class="pre">bjam</span></tt></a></h3>
+<h3><a class="toc-backref" href="#id36">5.2.4&nbsp;&nbsp;&nbsp;Invoke <tt class="docutils literal"><span class="pre">bjam</span></tt></a></h3>
 <p>Change your current directory to the Boost root directory and
 <p>Change your current directory to the Boost root directory and
 invoke <tt class="docutils literal"><span class="pre">bjam</span></tt> as follows:</p>
 invoke <tt class="docutils literal"><span class="pre">bjam</span></tt> as follows:</p>
 <pre class="literal-block">
 <pre class="literal-block">
@@ -491,7 +491,7 @@ bjam <strong>--build-dir=</strong><a class="reference internal" href="#id12"><em
 </pre>
 </pre>
 <p>For example, your session might look like this:<a class="footnote-reference" href="#continuation" id="id13"><sup>4</sup></a></p>
 <p>For example, your session might look like this:<a class="footnote-reference" href="#continuation" id="id13"><sup>4</sup></a></p>
 <pre class="literal-block">
 <pre class="literal-block">
-C:WINDOWS&gt; cd <tt class="docutils literal"><span class="pre">C:\Program</span> <span class="pre">Files\boost\</span></tt><tt class="docutils literal"><span class="pre">boost_1_34_0</span></tt>
+C:\WINDOWS&gt; cd <tt class="docutils literal"><span class="pre">C:\Program</span> <span class="pre">Files\boost\</span></tt><tt class="docutils literal"><span class="pre">boost_1_34_0</span></tt>
 <tt class="docutils literal"><span class="pre">C:\Program</span> <span class="pre">Files\boost\</span></tt><tt class="docutils literal"><span class="pre">boost_1_34_0</span></tt>&gt; bjam <strong>^</strong>
 <tt class="docutils literal"><span class="pre">C:\Program</span> <span class="pre">Files\boost\</span></tt><tt class="docutils literal"><span class="pre">boost_1_34_0</span></tt>&gt; bjam <strong>^</strong>
 More? <strong>--build-dir=</strong>%TEMP%\build-boost <strong>^</strong>
 More? <strong>--build-dir=</strong>%TEMP%\build-boost <strong>^</strong>
 More? <strong>--toolset=</strong>msvc stage
 More? <strong>--toolset=</strong>msvc stage
@@ -523,7 +523,7 @@ be interested in:</p>
 </div>
 </div>
 </div>
 </div>
 <div class="section" id="expected-build-output">
 <div class="section" id="expected-build-output">
-<h2><a class="toc-backref" href="#id36">5.3&nbsp;&nbsp;&nbsp;Expected Build Output</a></h2>
+<h2><a class="toc-backref" href="#id37">5.3&nbsp;&nbsp;&nbsp;Expected Build Output</a></h2>
 <p>During the process of building Boost libraries, you can expect to
 <p>During the process of building Boost libraries, you can expect to
 see some messages printed on the console.  These may include</p>
 see some messages printed on the console.  These may include</p>
 <ul>
 <ul>
@@ -547,7 +547,7 @@ look something like:</p>
 </ul>
 </ul>
 </div>
 </div>
 <div class="section" id="in-case-of-build-errors">
 <div class="section" id="in-case-of-build-errors">
-<h2><a class="toc-backref" href="#id37">5.4&nbsp;&nbsp;&nbsp;In Case of Build Errors</a></h2>
+<h2><a class="toc-backref" href="#id38">5.4&nbsp;&nbsp;&nbsp;In Case of Build Errors</a></h2>
 <p>The only error messages you see when building Boost—if any—should
 <p>The only error messages you see when building Boost—if any—should
 be related to the IOStreams library's support of zip and bzip2
 be related to the IOStreams library's support of zip and bzip2
 formats as described <a class="reference external" href="../../libs/iostreams/doc/installation.html">here</a>.  Install the relevant development
 formats as described <a class="reference external" href="../../libs/iostreams/doc/installation.html">here</a>.  Install the relevant development
@@ -565,7 +565,7 @@ questions about configuring Boost for your compiler to the
 </div>
 </div>
 </div>
 </div>
 <div class="section" id="link-your-program-to-a-boost-library">
 <div class="section" id="link-your-program-to-a-boost-library">
-<h1><a class="toc-backref" href="#id38">6&nbsp;&nbsp;&nbsp;Link Your Program to a Boost Library</a></h1>
+<h1><a class="toc-backref" href="#id39">6&nbsp;&nbsp;&nbsp;Link Your Program to a Boost Library</a></h1>
 <p>To demonstrate linking with a Boost binary library, we'll use the
 <p>To demonstrate linking with a Boost binary library, we'll use the
 following simple program that extracts the subject lines from
 following simple program that extracts the subject lines from
 emails.  It uses the <a class="reference external" href="../../libs/regex/index.html">Boost.Regex</a> library, which has a
 emails.  It uses the <a class="reference external" href="../../libs/regex/index.html">Boost.Regex</a> library, which has a
@@ -599,15 +599,18 @@ project.</li>
 </ol>
 </ol>
 <div class="admonition-auto-linking admonition">
 <div class="admonition-auto-linking admonition">
 <p class="first admonition-title">Auto-Linking</p>
 <p class="first admonition-title">Auto-Linking</p>
-<p class="last">Most Windows compilers and linkers have so-called “auto-linking
+<p>Most Windows compilers and linkers have so-called “auto-linking
 support,” which eliminates the second challenge.  Special code in
 support,” which eliminates the second challenge.  Special code in
 Boost header files detects your compiler options and uses that
 Boost header files detects your compiler options and uses that
 information to encode the name of the correct library into your
 information to encode the name of the correct library into your
 object files; the linker selects the library with that name from
 object files; the linker selects the library with that name from
 the directories you've told it to search.</p>
 the directories you've told it to search.</p>
+<p class="last">The GCC toolchains (Cygwin and MinGW) are notable exceptions;
+GCC users should refer to the <a class="reference external" href="unix-variants.html#link-your-program-to-a-boost-library">linking instructions for Unix
+variant OSes</a> for the appropriate command-line options to use.</p>
 </div>
 </div>
 <div class="section" id="link-from-within-the-visual-studio-ide">
 <div class="section" id="link-from-within-the-visual-studio-ide">
-<h2><a class="toc-backref" href="#id39">6.1&nbsp;&nbsp;&nbsp;Link From Within the Visual Studio IDE</a></h2>
+<h2><a class="toc-backref" href="#id40">6.1&nbsp;&nbsp;&nbsp;Link From Within the Visual Studio IDE</a></h2>
 <p>Starting with the <a class="reference internal" href="#vs-header-only">header-only example project</a> we created
 <p>Starting with the <a class="reference internal" href="#vs-header-only">header-only example project</a> we created
 earlier:</p>
 earlier:</p>
 <ol class="arabic simple">
 <ol class="arabic simple">
@@ -621,7 +624,7 @@ e.g. <tt class="docutils literal"><span class="pre">C:\Program</span> <span clas
 <p><a class="reference internal" href="#test-your-program"><em>skip to the next step</em></a></p>
 <p><a class="reference internal" href="#test-your-program"><em>skip to the next step</em></a></p>
 </div>
 </div>
 <div class="section" id="or-link-from-the-command-prompt">
 <div class="section" id="or-link-from-the-command-prompt">
-<h2><a class="toc-backref" href="#id40">6.2&nbsp;&nbsp;&nbsp;Or, Link From the Command Prompt</a></h2>
+<h2><a class="toc-backref" href="#id41">6.2&nbsp;&nbsp;&nbsp;Or, Link From the Command Prompt</a></h2>
 <p>For example, we can compile and link the above program from the
 <p>For example, we can compile and link the above program from the
 Visual C++ command-line by simply adding the <strong>bold</strong> text below to
 Visual C++ command-line by simply adding the <strong>bold</strong> text below to
 the command line we used earlier, assuming your Boost binaries are
 the command line we used earlier, assuming your Boost binaries are
@@ -632,7 +635,7 @@ cl /EHsc /I <em>path\to\</em><tt class="docutils literal"><span class="pre">boos
 </pre>
 </pre>
 </div>
 </div>
 <div class="section" id="library-naming">
 <div class="section" id="library-naming">
-<h2><a class="toc-backref" href="#id41">6.3&nbsp;&nbsp;&nbsp;Library Naming</a></h2>
+<h2><a class="toc-backref" href="#id42">6.3&nbsp;&nbsp;&nbsp;Library Naming</a></h2>
 <div class="note">
 <div class="note">
 <p class="first admonition-title">Note</p>
 <p class="first admonition-title">Note</p>
 <p>If, like Visual C++, your compiler supports auto-linking,
 <p>If, like Visual C++, your compiler supports auto-linking,
@@ -654,7 +657,7 @@ following elements:</p>
 <dd><em>Prefix</em>: except on Microsoft Windows, every Boost library
 <dd><em>Prefix</em>: except on Microsoft Windows, every Boost library
 name begins with this string.  On Windows, only ordinary static
 name begins with this string.  On Windows, only ordinary static
 libraries use the <tt class="docutils literal"><span class="pre">lib</span></tt> prefix; import libraries and DLLs do
 libraries use the <tt class="docutils literal"><span class="pre">lib</span></tt> prefix; import libraries and DLLs do
-not.<a class="footnote-reference" href="#distinct" id="id18"><sup>6</sup></a></dd>
+not.<a class="footnote-reference" href="#distinct" id="id19"><sup>6</sup></a></dd>
 <dt><tt class="docutils literal"><span class="pre">boost_regex</span></tt></dt>
 <dt><tt class="docutils literal"><span class="pre">boost_regex</span></tt></dt>
 <dd><em>Library name</em>: all boost library filenames begin with <tt class="docutils literal"><span class="pre">boost_</span></tt>.</dd>
 <dd><em>Library name</em>: all boost library filenames begin with <tt class="docutils literal"><span class="pre">boost_</span></tt>.</dd>
 <dt><tt class="docutils literal"><span class="pre">-vc71</span></tt></dt>
 <dt><tt class="docutils literal"><span class="pre">-vc71</span></tt></dt>
@@ -692,14 +695,14 @@ libraries.</td>
 <td>using a special <a class="reference external" href="../../libs/python/doc/building.html#variants">debug build of Python</a>.</td>
 <td>using a special <a class="reference external" href="../../libs/python/doc/building.html#variants">debug build of Python</a>.</td>
 </tr>
 </tr>
 <tr><td><tt class="docutils literal"><span class="pre">d</span></tt></td>
 <tr><td><tt class="docutils literal"><span class="pre">d</span></tt></td>
-<td>building a debug version of your code.<a class="footnote-reference" href="#debug-abi" id="id19"><sup>7</sup></a></td>
+<td>building a debug version of your code.<a class="footnote-reference" href="#debug-abi" id="id20"><sup>7</sup></a></td>
 </tr>
 </tr>
 <tr><td><tt class="docutils literal"><span class="pre">p</span></tt></td>
 <tr><td><tt class="docutils literal"><span class="pre">p</span></tt></td>
 <td>using the STLPort standard library rather than the default one supplied with
 <td>using the STLPort standard library rather than the default one supplied with
 your compiler.</td>
 your compiler.</td>
 </tr>
 </tr>
 <tr><td><tt class="docutils literal"><span class="pre">n</span></tt></td>
 <tr><td><tt class="docutils literal"><span class="pre">n</span></tt></td>
-<td>using STLPort's deprecated “native iostreams” feature.<a class="footnote-reference" href="#native" id="id20"><sup>8</sup></a></td>
+<td>using STLPort's deprecated “native iostreams” feature.<a class="footnote-reference" href="#native" id="id21"><sup>8</sup></a></td>
 </tr>
 </tr>
 </tbody>
 </tbody>
 </table>
 </table>
@@ -732,7 +735,7 @@ version number, will also be created.</dd>
 <!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -->
 <!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -->
 </div>
 </div>
 <div class="section" id="test-your-program">
 <div class="section" id="test-your-program">
-<h2><a class="toc-backref" href="#id42">6.4&nbsp;&nbsp;&nbsp;Test Your Program</a></h2>
+<h2><a class="toc-backref" href="#id43">6.4&nbsp;&nbsp;&nbsp;Test Your Program</a></h2>
 <p>To test our subject extraction, we'll filter the following text
 <p>To test our subject extraction, we'll filter the following text
 file.  Copy it out of your browser and save it as <tt class="docutils literal"><span class="pre">jayne.txt</span></tt>:</p>
 file.  Copy it out of your browser and save it as <tt class="docutils literal"><span class="pre">jayne.txt</span></tt>:</p>
 <pre class="literal-block">
 <pre class="literal-block">
@@ -754,7 +757,7 @@ Spoil Rock Hunter?”</p>
 </div>
 </div>
 </div>
 </div>
 <div class="section" id="conclusion-and-further-resources">
 <div class="section" id="conclusion-and-further-resources">
-<h1><a class="toc-backref" href="#id43">7&nbsp;&nbsp;&nbsp;Conclusion and Further Resources</a></h1>
+<h1><a class="toc-backref" href="#id44">7&nbsp;&nbsp;&nbsp;Conclusion and Further Resources</a></h1>
 <p>This concludes your introduction to Boost and to integrating it
 <p>This concludes your introduction to Boost and to integrating it
 with your programs.  As you start using Boost in earnest, there are
 with your programs.  As you start using Boost in earnest, there are
 surely a few additional points you'll wish we had covered.  One day
 surely a few additional points you'll wish we had covered.  One day
@@ -834,7 +837,7 @@ have any source code mechanism for suppressing warnings.</td></tr>
 <table class="docutils footnote" frame="void" id="distinct" rules="none">
 <table class="docutils footnote" frame="void" id="distinct" rules="none">
 <colgroup><col class="label" /><col /></colgroup>
 <colgroup><col class="label" /><col /></colgroup>
 <tbody valign="top">
 <tbody valign="top">
-<tr><td class="label"><a class="fn-backref" href="#id18">[6]</a></td><td>This convention distinguishes the static version of
+<tr><td class="label"><a class="fn-backref" href="#id19">[6]</a></td><td>This convention distinguishes the static version of
 a Boost library from the import library for an
 a Boost library from the import library for an
 identically-configured Boost DLL, which would otherwise have the
 identically-configured Boost DLL, which would otherwise have the
 same name.</td></tr>
 same name.</td></tr>
@@ -843,7 +846,7 @@ same name.</td></tr>
 <table class="docutils footnote" frame="void" id="debug-abi" rules="none">
 <table class="docutils footnote" frame="void" id="debug-abi" rules="none">
 <colgroup><col class="label" /><col /></colgroup>
 <colgroup><col class="label" /><col /></colgroup>
 <tbody valign="top">
 <tbody valign="top">
-<tr><td class="label"><a class="fn-backref" href="#id19">[7]</a></td><td>These libraries were compiled without optimization
+<tr><td class="label"><a class="fn-backref" href="#id20">[7]</a></td><td>These libraries were compiled without optimization
 or inlining, with full debug symbols enabled, and without
 or inlining, with full debug symbols enabled, and without
 <tt class="docutils literal"><span class="pre">NDEBUG</span></tt> <tt class="docutils literal"><span class="pre">#define</span></tt>d.  Although it's true that sometimes
 <tt class="docutils literal"><span class="pre">NDEBUG</span></tt> <tt class="docutils literal"><span class="pre">#define</span></tt>d.  Although it's true that sometimes
 these choices don't affect binary compatibility with other
 these choices don't affect binary compatibility with other
@@ -853,7 +856,7 @@ compiled code, you can't count on that with Boost libraries.</td></tr>
 <table class="docutils footnote" frame="void" id="native" rules="none">
 <table class="docutils footnote" frame="void" id="native" rules="none">
 <colgroup><col class="label" /><col /></colgroup>
 <colgroup><col class="label" /><col /></colgroup>
 <tbody valign="top">
 <tbody valign="top">
-<tr><td class="label"><a class="fn-backref" href="#id20">[8]</a></td><td>This feature of STLPort is deprecated because it's
+<tr><td class="label"><a class="fn-backref" href="#id21">[8]</a></td><td>This feature of STLPort is deprecated because it's
 impossible to make it work transparently to the user; we don't
 impossible to make it work transparently to the user; we don't
 recommend it.</td></tr>
 recommend it.</td></tr>
 </tbody>
 </tbody>

+ 8 - 1
more/getting_started/windows.rst

@@ -199,7 +199,7 @@ For example, your session might look like this: [#continuation]_
 
 
 .. parsed-literal::
 .. parsed-literal::
 
 
-   C:\WINDOWS> cd |default-root|
+   C:\\WINDOWS> cd |default-root|
    |default-root|> bjam **^**
    |default-root|> bjam **^**
    More? **--build-dir=**\ %TEMP%\\build-boost **^**
    More? **--build-dir=**\ %TEMP%\\build-boost **^**
    More? **--toolset=**\ msvc stage
    More? **--toolset=**\ msvc stage
@@ -219,6 +219,13 @@ For example, your session might look like this: [#continuation]_
    object files; the linker selects the library with that name from
    object files; the linker selects the library with that name from
    the directories you've told it to search.
    the directories you've told it to search.
 
 
+   The GCC toolchains (Cygwin and MinGW) are notable exceptions;
+   GCC users should refer to the `linking instructions for Unix
+   variant OSes`__ for the appropriate command-line options to use.
+
+__ unix-variants.html#link-your-program-to-a-boost-library
+
+
 Link From Within the Visual Studio IDE
 Link From Within the Visual Studio IDE
 --------------------------------------
 --------------------------------------
 
 

粤ICP备19079148号