Skip to content

Commit 1f78c74

Browse files
dabrahamsdabrahams
committed
fixes
[SVN r12146]
1 parent c494649 commit 1f78c74

73 files changed

Lines changed: 5950 additions & 584 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Jamfile‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
subproject libs/python ;
2+
3+
# bring in the rules for python
4+
SEARCH on <module@>python.jam = $(BOOST_BUILD_PATH) ;
5+
include <module@>python.jam ;
6+
7+
PYTHON_PROPERTIES
8+
+= <metrowerks><*><cxxflags>"-inline deferred"
9+
<cxx><*><include>$(BOOST_ROOT)/boost/compatibility/cpp_c_headers
10+
<define>BOOST_PYTHON_DYNAMIC_LIB
11+
;
12+
13+
14+
dll bpl
15+
:
16+
src/converter/body.cpp
17+
src/converter/handle.cpp
18+
src/converter/registry.cpp
19+
src/converter/wrapper.cpp
20+
src/converter/unwrap.cpp
21+
src/converter/unwrapper.cpp
22+
src/converter/type_id.cpp
23+
src/object/class.cpp
24+
src/object/function.cpp
25+
src/errors.cpp
26+
:
27+
$(PYTHON_PROPERTIES)
28+
<define>BOOST_PYTHON_SOURCE
29+
;
30+
31+
extension m1 : test/m1.cpp <lib>bpl # <define>BOOST_PYTHON_TRACE
32+
:
33+
: debug-python ;
34+
35+
extension m2 : test/m2.cpp <lib>bpl # <define>BOOST_PYTHON_TRACE
36+
:
37+
: debug-python ;
38+
39+
boost-python-runtest try : test/newtest.py <lib>m1 <lib>m2 : : debug-python ;

‎build/Jamfile‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ subproject libs/python/build ;
6161
SEARCH on <module@>python.jam = $(BOOST_BUILD_PATH) ;
6262
include <module@>python.jam ;
6363

64+
local PYTHON_PROPERTIES = $(PYTHON_PROPERTIES) <define>BOOST_PYTHON_DYNAMIC_LIB ;
65+
6466
#######################
6567
local rule bpl-test ( test-name : sources + )
6668
{
@@ -75,21 +77,27 @@ local rule bpl-test ( test-name : sources + )
7577

7678
# Base names of the source files for libboost_python
7779
local CPP_SOURCES =
78-
types classes conversions extension_class functions
79-
init_function module_builder objects cross_module ;
80+
types classes conversions extension_class functions
81+
init_function module_builder objects cross_module errors
82+
;
8083

81-
lib libboost_python : ../src/$(CPP_SOURCES).cpp
84+
lib libboost_python_static : ../src/$(CPP_SOURCES).cpp
8285
# requirements
8386
: $(BOOST_PYTHON_INCLUDES)
8487
<shared-linkable>true
88+
<define>BOOST_PYTHON_STATIC_LIB=1
8589
$(PYTHON_PROPERTIES) ;
8690

87-
dll libboost_python$(SUFDLL[1]) : ../src/$(CPP_SOURCES).cpp
91+
dll libboost_python
92+
# $(SUFDLL[1])
93+
: ../src/$(CPP_SOURCES).cpp
8894
# requirements
89-
: $(BOOST_PYTHON_INCLUDES)
95+
: $(BOOST_PYTHON_INCLUDES)
9096
<shared-linkable>true
91-
<define>BOOST_RE_BUILD_DLL=1
92-
$(PYTHON_PROPERTIES) ;
97+
<runtime-link>dynamic
98+
<define>BOOST_PYTHON_HAS_DLL_RUNTIME=1
99+
$(PYTHON_PROPERTIES)
100+
;
93101

94102
############# comprehensive module and test ###########
95103
bpl-test boost_python_test

0 commit comments

Comments
 (0)