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

+ fixed building with boost-1_36

Browse source 
+ corrected order of BOOST_TOOLKIT 
(create symlinks on OSX + boost-1_35)
This commit is contained in:
Artem Pavlenko 2008-10-08 06:30:38 +00:00
parent 6aabfc9ffb
commit df8cfcab03
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -189,7 +189,7 @@ else:
for count, libinfo in enumerate(BOOST_LIBSHEADERS):
if env['THREADING'] == 'multi' :
if not conf.CheckLibWithHeader('boost_%s%s%s' % (libinfo[0],thread_suffix,env['BOOST_APPEND']), libinfo[1], 'C++') and libinfo[2] :
if not conf.CheckLibWithHeader('boost_%s%s%s' % (libinfo[0],env['BOOST_APPEND'],thread_suffix), libinfo[1], 'C++') and libinfo[2] :
color_print(1,'Could not find header or shared library for boost %s, exiting!' % libinfo[0])
Exit(1)
elif not conf.CheckLibWithHeader('boost_%s%s' % (libinfo[0], env['BOOST_APPEND']), libinfo[1], 'C++') :

6
bindings/python/SConscript
View file

@ -40,7 +40,7 @@ if env['PLATFORM'] == 'FreeBSD':
linkflags = ''
libraries = ['mapnik','png','jpeg']
if env['THREADING'] == 'multi':
libraries.append('boost_python%s%s' % (thread_suffix,env['BOOST_APPEND']))
libraries.append('boost_python%s%s' % (env['BOOST_APPEND'],thread_suffix))
else :
libraries.append('boost_python%s' % env['BOOST_APPEND'])
@ -48,11 +48,11 @@ if env['PLATFORM'] == 'Darwin':
libraries.append('icuuc')
libraries.append('icudata')
if env['THREADING'] == 'multi':
libraries.append('boost_regex%s%s' % (thread_suffix,env['BOOST_APPEND']))
libraries.append('boost_regex%s%s' % (env['BOOST_APPEND'],thread_suffix))
else :
libraries.append('boost_regex%s' % env['BOOST_APPEND'])
if env['THREADING'] == 'multi':
libraries.append('boost_thread%s%s' % (thread_suffix,env['BOOST_APPEND']))
libraries.append('boost_thread%s%s' % (env['BOOST_APPEND'],thread_suffix))
if '-DHAVE_PYCAIRO' in env['CXXFLAGS']:
libraries.append([lib for lib in env['LIBS'] if lib.startswith('cairo')])
linkflags = '-F/ -framework Python'

2
plugins/input/shape/SConscript
View file

@ -40,7 +40,7 @@ if env['PLATFORM'] == 'FreeBSD':
thread_suffix = ''
if env['THREADING'] == 'multi':
libraries = ['boost_iostreams%s%s' % (thread_suffix,env['BOOST_APPEND']) ]
libraries = ['boost_iostreams%s%s' % (env['BOOST_APPEND'],thread_suffix) ]
else:
libraries = ['boost_iostreams%s' % (env['BOOST_APPEND']) ]

2
src/datasource_cache.cpp
View file

@ -125,7 +125,7 @@ namespace mapnik
{
for (filesystem::directory_iterator itr(path);itr!=end_itr;++itr )
{
if (!is_directory( *itr ) && is_input_plugin(itr->leaf()))
if (!is_directory( *itr ) && is_input_plugin(itr->path().leaf()))
{
try
{