Skip to content

Commit ba4906d

Browse files
committed
Update V2 Jamfile for Boost.
[SVN r16882]
1 parent e13a11e commit ba4906d

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

build/Jamfile.v2

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,31 @@ else if [ GLOB /usr/include/python2.2 : * ]
1313
PYTHON_PATH = /usr ;
1414
}
1515

16-
PYTHON_LIB = python2.2 ;
17-
1816
if [ os.name ] in CYGWIN NT
1917
{
20-
lib_condition = <shared>true: ;
18+
lib_condition = <link>shared: ;
2119
defines = USE_DL_IMPORT ;
22-
PYTHON_LIB = python2.2.dll ;
20+
21+
# Declare a target for the python interpreter library
22+
lib python : : <name>python2.2.dll ;
23+
PYTHON_LIB = python ;
24+
}
25+
else
26+
{
27+
lib python : : <name>python2.2 ;
28+
PYTHON_LIB = python ;
2329
}
2430

31+
32+
2533
if $(PYTHON_PATH) {
2634

2735

2836
project boost/python
2937
: source-location ../src
3038
: requirements <include>$(PYTHON_PATH)/include/python2.2
3139
$(lib_condition)<library-path>$(PYTHON_PATH)/lib/python2.2/config
32-
<shared>true:<find-library>$(PYTHON_LIB)
40+
<link>shared:<library>$(PYTHON_LIB)
3341
<define>$(defines)
3442
: use-requirements # requirement that will be propageted to *users* of this library
3543
<include>$(PYTHON_PATH)/include/python2.2
@@ -40,7 +48,7 @@ project boost/python
4048
# <shared>true:<find-library>$(PYTHON_LIB)
4149

4250
<library-path>$(PYTHON_PATH)/lib/python2.2/config
43-
<find-library>$(PYTHON_LIB)
51+
<library>$(PYTHON_LIB)
4452
;
4553

4654
lib boost_python
@@ -70,8 +78,8 @@ lib boost_python
7078
object/iterator.cpp
7179
object_protocol.cpp
7280
object_operators.cpp
73-
: <shared>false:<define>BOOST_PYTHON_STATIC_LIB
81+
: <link>static:<define>BOOST_PYTHON_STATIC_LIB
7482
<define>BOOST_PYTHON_SOURCE
75-
: <shared>true
83+
: <link>shared
7684
;
7785
}

example/Jamfile.v2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@ project
77

88
python-extension getting_started1 : getting_started1.cpp : <shared>true ;
99
python-extension getting_started2 : getting_started2.cpp : <shared>true ;
10+
11+
exe embedding_test : embedding_test.cpp : <define>BOOST_PYTHON_DYNAMIC_LIB <shared>true ;
1012

0 commit comments

Comments
 (0)