mirror of
https://github.com/boostorg/build.git
synced 2026-02-15 13:02:11 +00:00
merge RC_1_32_0 fixes
[SVN r26333]
This commit is contained in:
@@ -11,4 +11,7 @@
|
||||
extends-toolset intel-win32-stlport ;
|
||||
feature stlport-iostream : on off ;
|
||||
DEFINES = [ difference $(DEFINES) : _STLP_NO_SGI_IOSTREAMS=1 ] ;
|
||||
# disable auto-linking for this toolset:
|
||||
# intel toolset lib naming is currently too inconsistent for auto-linking to work.
|
||||
CFLAGS += "/DBOOST_ALL_NO_LIB=1" ;
|
||||
}
|
||||
|
||||
@@ -9,4 +9,7 @@
|
||||
#//<a href="http://developer.intel.com/software/products/compilers/">Intel<br>C++</a>
|
||||
{
|
||||
extends-toolset intel-win32 ;
|
||||
# disable auto-linking for this toolset:
|
||||
# intel toolset lib naming is currently too inconsistent for auto-linking to work.
|
||||
CFLAGS += "/DBOOST_ALL_NO_LIB=1" ;
|
||||
}
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
i-checksum="38515" endspan --></p>
|
||||
|
||||
<p><i>© Copyright</i> <a href="mailto:john@johnmaddock.co.uk"><i>John
|
||||
Maddock</i></a><i>2002. All Rights Reserved.</i></p>
|
||||
Maddock</i></a><i> 2002.</i></p>
|
||||
|
||||
<p><small>Distributed under the Boost Software License, Version 1.0. (See
|
||||
accompanying file <a href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or
|
||||
|
||||
@@ -91,11 +91,16 @@
|
||||
<td> </td>
|
||||
</tr>
|
||||
</table>
|
||||
<p><b>Caution</b>: It appears that none of these paths must contain any
|
||||
spaces, otherwise <b>spurious</b> file not found errors can result (last
|
||||
reproduced with GCC3.3.1). To work around this limitation, either install
|
||||
the MinGW under a path that does not contain spaces or use 8.3 names. For
|
||||
example, if MinGW is installed in C:\Program Files\Dev-Cpp, <code>"-sMINGW_ROOT_DIRECTORY=C:\Progra~1\Dev-Cpp"</code>
|
||||
should be specified on the bjam command line.</p>
|
||||
<hr>
|
||||
|
||||
<p>Revised
|
||||
<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
|
||||
14 May, 2002 <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
|
||||
<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->04 November, 2004<!--webbot bot="Timestamp" endspan i-checksum="39360" --></p>
|
||||
|
||||
<p>Copyright © Dave Abrahams 2002.</p>
|
||||
|
||||
|
||||
@@ -103,7 +103,7 @@ and linked it.
|
||||
|
||||
<para>In the subsequent sections, we will extend this example, and review
|
||||
all the mechanisms in detail. The complete code is available in <ulink url=
|
||||
"../../../tools/build/v2/example/customization">example/customization</ulink>
|
||||
"../../tools/build/v2/example/customization">example/customization</ulink>
|
||||
directory.
|
||||
</para>
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
<listitem>
|
||||
<simpara>
|
||||
Boost.Build uses <ulink
|
||||
url= "../../../tools/build/jam_src/index.html">Boost.Jam</ulink>, an
|
||||
url= "../../tools/build/jam_src/index.html">Boost.Jam</ulink>, an
|
||||
extension of the <ulink
|
||||
url="http://www.perforce.com/jam/jam.html">Perforce
|
||||
Jam</ulink> portable <command>make</command> replacement. The
|
||||
@@ -37,7 +37,7 @@
|
||||
If a prebuilt executable is not provided for your platform
|
||||
or you are using Boost's sources in an unreleased state, it
|
||||
may be neccessary to <ulink
|
||||
url= "../../../tools/build/jam_src/index.html#building_bjam">build <command>bjam</command>
|
||||
url= "../../tools/build/jam_src/index.html#building_bjam">build <command>bjam</command>
|
||||
from sources</ulink> included in the Boost source tree.
|
||||
</simpara>
|
||||
</listitem>
|
||||
|
||||
@@ -43,7 +43,7 @@ div.sidebar p.rubric {
|
||||
<li>Nightly build: <a href="http://boost.org/boost-build2/boost-build.zip">[zip]</a>,
|
||||
<a href="http://boost.org/boost-build2/boost-build.tar.bz2">[tar.bz2]</a>
|
||||
<li><a href="../../../doc/html/bbv2.html">Documentation</a>
|
||||
(<a href="userman.pdf">PDF</a>)
|
||||
(<a href="doc/userman.pdf">PDF</a>)
|
||||
<li><a
|
||||
href="http://www.crystalclearsoftware.com/cgi-bin/boost_wiki/wiki.pl?Boost.Build_V2">Wiki
|
||||
(User-contibuted documentation)</a>
|
||||
|
||||
Reference in New Issue
Block a user