sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into geometry_cleanup

Browse source
This commit is contained in:
Artem Pavlenko 2011-12-16 09:15:02 +00:00
commit 9fe444ba29
2 changed files with 38 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bindings/python/build.py
View file

@ -44,10 +44,6 @@ target_path = os.path.normpath(env['PYTHON_INSTALL_LOCATION'] + os.path.sep + 'm
target_path_deprecated = os.path.normpath(env['PYTHON_INSTALL_LOCATION'] + os.path.sep + 'mapnik2') target_path_deprecated = os.path.normpath(env['PYTHON_INSTALL_LOCATION'] + os.path.sep + 'mapnik2')
libraries = ['mapnik'] libraries = ['mapnik']
libraries.append('png')
if env['JPEG']:
libraries.append('jpeg')
if env['BOOST_PYTHON_LIB']: if env['BOOST_PYTHON_LIB']:
libraries.append(env['BOOST_PYTHON_LIB']) libraries.append(env['BOOST_PYTHON_LIB'])
@ -57,7 +53,12 @@ else:
else: else:
libraries.append('boost_python%s' % env['BOOST_APPEND']) libraries.append('boost_python%s' % env['BOOST_APPEND'])
# TODO - do solaris/fedora need direct linking too?
if env['PLATFORM'] == 'Darwin': if env['PLATFORM'] == 'Darwin':
if not env['PYTHON_DYNAMIC_LOOKUP']:
libraries.append('png')
if env['JPEG']:
libraries.append('jpeg')
libraries.append(env['ICU_LIB_NAME']) libraries.append(env['ICU_LIB_NAME'])
libraries.append('boost_regex%s' % env['BOOST_APPEND']) libraries.append('boost_regex%s' % env['BOOST_APPEND'])
if env['THREADING'] == 'multi': if env['THREADING'] == 'multi':
@ -107,6 +108,7 @@ if env['PLATFORM'] == 'Darwin':
else: else:
# TODO - do we need to pass -L/? # TODO - do we need to pass -L/?
python_link_flag = '-lpython%s' % env['PYTHON_VERSION'] python_link_flag = '-lpython%s' % env['PYTHON_VERSION']
elif env['PLATFORM'] == 'SunOS': elif env['PLATFORM'] == 'SunOS':
# make sure to explicitly link mapnik.so against # make sure to explicitly link mapnik.so against
# libmapnik in its installed location # libmapnik in its installed location